projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8949975 a83fe32)
Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorJesse Barnes <[email protected]>
Mon, 18 Aug 2008 16:54:13 +0000 (09:54 -0700)
committerJesse Barnes <[email protected]>
Mon, 18 Aug 2008 16:54:13 +0000 (09:54 -0700)
Conflicts:

drivers/pci/probe.c

1  2 
drivers/pci/probe.c patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/probe.c
Simple merge
John Crispins staging tree