Merge branch 'master' into aufs3.x-rcN/10static
Merge branch 'aufs3.x-rcN/10static' into aufs3.x-rcN/11proc_map
Merge branch 'aufs3.x-rcN/11proc_map' into aufs3.x-rcN/18public
aufs: tiny, remove a space

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Revert "rw_semaphore: remove up/down_read_non_owner"

This reverts commit 11b80f459adaf91a712f95e7734a17655a36bf30.
Export get_random_int()
Export blk_fill_rwbs()

Exported so it can be used by bcache's tracepoints
Export __lockdep_no_validate__
bcache: A block layer cache

Signed-off-by: Kent Overstreet <koverstreet@google.com>
Merge tag 'v3.7' of /src/linux/linux into aufs3.7/10static
version 3.7

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Merge branch 'aufs3.0/00base' into aufs3.1/00base
Merge branch 'aufs3.1/00base' into aufs3.2/00base
Merge branch 'aufs3.2/00base' into aufs3.3/00base
Merge branch 'aufs3.3/00base' into aufs3.4/00base
Merge branch 'aufs3.4/00base' into aufs3.5/00base
Merge branch 'aufs3.5/00base' into aufs3.6/00base
Merge branch 'aufs3.6/00base' into aufs3.7/00base
Merge remote branch 'aufs3-standalone/aufs3.0/00base' into aufs3.0/10static
aufs: update copyright for 2013

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>