| commit | 5261d661b49e0c133395c88da193457f62db439a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.osdl.org> | Thu Nov 23 09:17:16 2006 -0800 |
| committer | Linus Torvalds <torvalds@woody.osdl.org> | Thu Nov 23 09:17:16 2006 -0800 |
| tree | a79f0d67e19599a5b2728eca08b032e7ce976a4a | |
| parent | 490a6e245e36ce27e10c32e1c3129fd782d3d1f3 [diff] | |
| parent | 21f37bc3e51fac4f7a226a6d110c4c316af0d22d [diff] |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3941/1: [Jornada7xx] - Addition to MAINTAINERS [ARM] 3942/1: ARM: comment: consistent_sync should not be called directly [ARM] ebsa110: fix warnings generated by asm/arch/io.h [ARM] 3933/1: Source drivers/ata/Kconfig