]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge tag 'v3.0.27' into uek2-2.6.39-300#14252075
authorGuangyu Sun <guangyu.sun@oracle.com>
Tue, 3 Jul 2012 21:13:20 +0000 (14:13 -0700)
committerGuangyu Sun <guangyu.sun@oracle.com>
Tue, 3 Jul 2012 21:13:20 +0000 (14:13 -0700)
commit17582393fe4bdf14af826f03a12a566f3f92de75
tree846b2e3f982fcb8d10337a975c51dfb24bf86778
parent227895579e3aca0bc8243e25187aae072f6bba94
parent8aa122f38398503c72a83f15c815e84e6e6e6890
Merge tag 'v3.0.27' into uek2-2.6.39-300#14252075

This is the 3.0.27 stable release

Conflicts:
drivers/hwmon/fam15h_power.c
drivers/net/e1000e/netdev.c
drivers/usb/serial/ftdi_sio.c
include/asm-generic/pgtable.h
net/ipv6/route.c

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
Makefile
arch/x86/kernel/apic/io_apic.c
arch/x86/kvm/x86.c
drivers/infiniband/ulp/iser/iscsi_iser.c
drivers/net/sky2.c
drivers/usb/serial/option.c
kernel/module.c