]> git.hungrycats.org Git - linux/commit
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
authorLinus Torvalds <torvalds@home.osdl.org>
Fri, 6 Feb 2004 04:06:21 +0000 (20:06 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Fri, 6 Feb 2004 04:06:21 +0000 (20:06 -0800)
commitdac9e97d6faf7c5fef80d8e1987fc1246aba2320
tree4f1492df959701993ccff661b0e11912e0f219e4
parent9e81ab3b7d7396810cbe4b2eddb7a86353f2f819
parent617a1bc9d3ce7d4e0771669cc3a94a3332632d85
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into home.osdl.org:/home/torvalds/v2.5/linux
include/asm-arm/pci.h