Merge branch 'linux-3.0.y' into uek2-stable

author Guangyu Sun <guangyu.sun@oracle.com>

Fri, 23 Mar 2012 16:33:26 +0000 (09:33 -0700)

committer Guangyu Sun <guangyu.sun@oracle.com>

Fri, 23 Mar 2012 16:33:26 +0000 (09:33 -0700)
author Guangyu Sun <guangyu.sun@oracle.com>
Fri, 23 Mar 2012 16:33:26 +0000 (09:33 -0700)
committer Guangyu Sun <guangyu.sun@oracle.com>
Fri, 23 Mar 2012 16:33:26 +0000 (09:33 -0700)
diff --cc Makefile
Simple merge
diff --cc fs/aio.c
Simple merge
diff --cc fs/block_dev.c
Simple merge
diff --cc include/linux/skbuff.h
Simple merge
author	Guangyu Sun <guangyu.sun@oracle.com>
	Fri, 23 Mar 2012 16:33:26 +0000 (09:33 -0700)
committer	Guangyu Sun <guangyu.sun@oracle.com>
	Fri, 23 Mar 2012 16:33:26 +0000 (09:33 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
fs/aio.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/block_dev.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	patch \|	diff1 \|	diff2 \|	blob \| history