www.infradead.org Git - users/jedix/linux-maple.git/commit

]> www.infradead.org Git - users/jedix/linux-maple.git/commit

projects / users / jedix / linux-maple.git / commit

author	Guangyu Sun <guangyu.sun@oracle.com>
	Tue, 3 Jul 2012 21:41:56 +0000 (14:41 -0700)
committer	Guangyu Sun <guangyu.sun@oracle.com>
	Tue, 3 Jul 2012 21:41:56 +0000 (14:41 -0700)
commit	7cee5d9a4c7ed1c25e3ca56bf5a885cd9dca944b
tree	2e7c1391eac83ef055c62345371e8c1e2a8ced4d	tree
parent	ac54d11c7ac34affaa4d5adc110a70e867ab19eb	commit \| diff
parent	c0bd4b6a0c6c0d42235920fb7ddd7110c86e2adb	commit \| diff

Merge tag 'v3.0.36' into uek2-2.6.39-300#14252075

This is the 3.0.36 stable release

Conflicts:
arch/x86/xen/enlighten.c
include/linux/pci.h

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	diff1 \|	diff2 \|	blob \| history