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)
commited408f7c0fab7ecc72f94f204f0d2607b2749f69
tree8c85eb47814fff6c9ea0aa6177e47555c0f9c5b1
parent52f7a82b59ff385da86a3ed17c8d9f6a83531004
parent7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619
Merge 3.9-rc4 into driver-core-next

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>
fs/debugfs/inode.c
init/Kconfig