]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48e49ea ec8510f)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Jun 2006 23:02:41 +0000 (16:02 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Jun 2006 23:02:41 +0000 (16:02 -0700)
* 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


Trivial merge
Linux 2.6 source tree