Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh...

Merge "ARM: Keystone soc config updates for 3.20" from Santosh Shilimkar:

Keystone DEVTMPFS config update for 3.20

* tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: config: add DEVTMPFS option by default to keystone config

Signed-off-by: Olof Johansson <olof@lixom.net>