| commit | 891eca1447a94b25fb59b696f839a2a6897d8f1f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jun 02 16:02:41 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jun 02 16:02:41 2006 -0700 |
| tree | 2ebdf249e13acb792f6d15c47ae9634221fc0c55 | |
| parent | 48e49ead3e92d53196a78c42cf24c0eed6ca98dd [diff] | |
| parent | ec8510f6fe57f59e42484809679af31ca7896dcf [diff] |
Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3540/1: ixp23xx: deal with gap in interrupt bitmasks [ARM] 3539/1: ixp23xx: fix __arch_ixp23xx_is_coherent() for A1 stepping