Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...
authorSimon Horman <horms+renesas@verge.net.au>
Wed, 13 Mar 2013 13:45:39 +0000 (22:45 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Wed, 13 Mar 2013 13:45:39 +0000 (22:45 +0900)

Trivial merge