]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e81ab3 617a1bc)
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)
into home.osdl.org:/home/torvalds/v2.5/linux

1  2 
include/asm-arm/pci.h patch | diff1 | diff2 | blob | history

diff --cc include/asm-arm/pci.h
Simple merge
Linux kernels and configurations used by Zygo.