]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 3.3-rc6 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Mar 2012 20:35:53 +0000 (12:35 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Mar 2012 20:35:53 +0000 (12:35 -0800)
commit49afd99c1d5b72c981e2a0face73d051f2d78afb
tree4f049e339d522b2ab0ba3bed3ec217e4bbc83d35
parent37d8dc03735d45c61aa4ba6e754dc5924b1e3791
parent46e9e5cfc2faf5092a0d6a6e8631caa7353afc07
Merge 3.3-rc6 into driver-core-next

This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/cpu.c
drivers/pci/xen-pcifront.c
drivers/pcmcia/ds.c
include/linux/hyperv.h
scripts/mod/file2alias.c