diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 16:10:38 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 16:10:38 +0300 |
| commit | d21872b3683ff37f73c68993749a6e6aeeaed265 (patch) | |
| tree | 0a84ae436325d6e646fe987516fb6bfccfff8a1c /drivers/w1 | |
| parent | 80690ccc41f01df6edfb6684006824d8edff189e (diff) | |
| parent | b3e69146f43fa351aa3cdffe2e76ec42174da612 (diff) | |
Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus
Conflicts:
arch/arm/mach-omap1/devices.c
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions