Merge branch 'master' into next (d2e7ad19) · Commits · github.com / kvm-riscv / linux

Commit d2e7ad19 authored Jan 10, 2011 by

James Morris

Merge branch 'master' into next



Conflicts:
	security/smack/smack_lsm.c

Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>

Signed-off-by: James Morris <jmorris@namei.org>

parents d03a5d88 0c21e3aa

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment