| commit | 7921127e297ea203b794c4a1c3ef3eb0ee52acbf | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 01 08:30:31 2011 +1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 01 08:30:31 2011 +1000 |
| tree | b7497bc5cf17f8c833d1d535e2f235dace25f069 | |
| parent | 35a8524ffe84667e805b9249316e729e050c83b2 [diff] | |
| parent | e98ff0f55a0232b578c9aa7f1c245868277ac7bc [diff] |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm: ARM: smp_on_up: allow non-ARM SMP processors ARM: io: ensure inb/outb() et.al. are properly ordered on ARMv6+ ARM: initrd: disable initrd if passed address overlaps reserved region ARM: footbridge: fix debug macros ARM: mmci: round down the bytes transferred on error ARM: mmci: complete the transaction on error ARM: 6642/1: mmci: calculate remaining bytes at error correctly