git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 37d8dc0 46e9e5c)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Fri, 9 Mar 2012 20:35:53 +0000 (12:35 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Fri, 9 Mar 2012 20:35:53 +0000 (12:35 -0800)
commit	49afd99c1d5b72c981e2a0face73d051f2d78afb
tree	4f049e339d522b2ab0ba3bed3ec217e4bbc83d35	tree \| snapshot
parent	37d8dc03735d45c61aa4ba6e754dc5924b1e3791	commit \| diff
parent	46e9e5cfc2faf5092a0d6a6e8631caa7353afc07	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/pci/xen-pcifront.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/ds.c	diff1 \|	diff2 \|	blob \| history
include/linux/hyperv.h	diff1 \|	diff2 \|	blob \| history
scripts/mod/file2alias.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.