]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52f7a82 7d1f9ae)
Merge 3.9-rc4 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jan 2013 03:48:18 +0000 (19:48 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jan 2013 03:48:18 +0000 (19:48 -0800)
This is to fix up a build problem with a wireless driver due to the
dynamic-debug patches in this branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
fs/debugfs/inode.c patch | diff1 | diff2 | blob | history
init/Kconfig patch | diff1 | diff2 | blob | history

diff --cc fs/debugfs/inode.c
Simple merge
diff --cc init/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.