]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 3.0.13 stable into uek2-stable
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Sat, 17 Dec 2011 01:01:27 +0000 (17:01 -0800)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Sat, 17 Dec 2011 01:01:27 +0000 (17:01 -0800)
commit2eebc01fd93fdf07fb517424faf5c03db85dc638
tree66fdd3b65bbd8dc4249940d01370c06edab72143
parent5bf9a99b4f6d1067d908fda05acecf44f6af32a2
parent56791c9185128842fc46ae7a763156c84ae5054d
Merge branch 3.0.13 stable into uek2-stable

Conflicts:
drivers/scsi/mpt2sas/mpt2sas_scsih.c (commit: 2a31a73f)
fs/block_dev.c
include/linux/vmalloc.h
mm/vmalloc.c