projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc47ab0 45e3e19)
Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 15 Jun 2009 00:36:54 +0000 (10:36 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 15 Jun 2009 00:36:54 +0000 (10:36 +1000)
1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history
include/linux/pci_ids.h patch | diff1 | diff2 | blob | history

diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.