diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 10:03:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 10:03:10 -0800 |
commit | 1a1b285c24e1468afe82b09330dde5192a6e0013 (patch) | |
tree | 94406d24339b3791b7b5481ee969f0300e3c48cf /drivers/w1 | |
parent | d72ec9e20e4de995aa957f171cf84b136689e4c0 (diff) | |
parent | 90e6b048365950416419c031f2f2d9a8afb5b70c (diff) | |
download | linux-1a1b285c24e1468afe82b09330dde5192a6e0013.tar.gz linux-1a1b285c24e1468afe82b09330dde5192a6e0013.tar.bz2 linux-1a1b285c24e1468afe82b09330dde5192a6e0013.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] vfp: fix fuitod/fsitod instructions
[ARM] pxa: silence warnings from cpu_is_xxx() macros
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions