Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Fri, 31 Oct 2014 09:45:01 +0000 (09:45 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 31 Oct 2014 09:45:01 +0000 (09:45 +0000)
commit8b2e026be184833ed76c622c8516b989ae438a4f
tree1b6aec62118ce8ba8be2f9b317a8ce0b71de9886
parent31581bd8dd68b38294852bbb9032173ba2cac1ab
parentff114805e1dc9b64c1f2e02fbb07a6ed309b18d8
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/base/firmware_class.c
fs/nfs/nfs4proc.c
include/linux/sched.h