git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 54d20f0 192cfd5)

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	263a5c8e16c34199ddf6de3f102e789ffa3ee26e
tree	4f049e339d522b2ab0ba3bed3ec217e4bbc83d35	tree \| snapshot
parent	54d20f006ceff1f2f1e69d0e54049b6c0765c039	commit \| diff
parent	192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d	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

Unnamed repository; edit this file 'description' to name the repository.