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

This is the 3.0.33 stable release

Conflicts:
	drivers/scsi/hpsa.c

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

diff --cc Makefile
Simple merge

diff --cc fs/aio.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc mm/mempolicy.c
Simple merge