Merge branch 'linux-3.0.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable...

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>

diff --cc block/blk-core.c
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/tg3.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_base.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_base.h
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_scsih.c
Simple merge