Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 10:22:32 +0000 (10:22 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 10:22:32 +0000 (10:22 +0000)
commit78157f5f8cde58d3c552ad6f0ad65118a92e3529
tree02476bdee08159c29579a99252f7b85a2275e60c
parentc4a3c95bcca5d9997e73c581b8cf6fb9adf8434c
parent16c29dd8dd14a722836ca31440486feb2d730e29
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/input/Kconfig
fs/nfs/nfs4proc.c
kernel/irq/pm.c