]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0592969 fea7a08)
Merge 3.6-rc3 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Aug 2012 14:08:39 +0000 (07:08 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Aug 2012 14:08:39 +0000 (07:08 -0700)
This picks up the printk fixes in 3.6-rc3 that are needed in this branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/base/core.c patch | diff1 | diff2 | blob | history
drivers/extcon/extcon-gpio.c patch | diff1 | diff2 | blob | history

diff --cc drivers/base/core.c
Simple merge
diff --cc drivers/extcon/extcon-gpio.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.