]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7dad1db3f0e033d89f45ba4088d45934b3e2c94f
tree8c85eb47814fff6c9ea0aa6177e47555c0f9c5b1
parent3716975b8f25316e42d9ece52978ab48bf275ac5
parentd42bf300c854fd32311775bff90e9686040e3609
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