aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-08-05 19:09:19 -0700
committerDavid S. Miller <davem@davemloft.net>2014-08-05 19:09:19 -0700
commit5b6ff9df056b69a3b65708bfb9923af41146c8c8 (patch)
tree3faf774df39b4365b81b0d20ef1d3ad6acdd2a5d /drivers/input
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff)
downloadlinux-dev-5b6ff9df056b69a3b65708bfb9923af41146c8c8.tar.xz
linux-dev-5b6ff9df056b69a3b65708bfb9923af41146c8c8.zip
sparc64: Fix up merge thinko.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/input')
0 files changed, 0 insertions, 0 deletions