Merge branch 'master' of git.linuxfoundation.org:ltsi-kernel
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jan 2014 22:51:54 +0000 (14:51 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jan 2014 22:51:54 +0000 (14:51 -0800)

Trivial merge