summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-prodikeys.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-30 09:12:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-30 09:12:43 -0700
commite38c1e54ce51059a1aa8744c895762906cf43b32 (patch)
tree6af00994b3d07da2db3419346f740ae06f3cfe7e /drivers/hid/hid-prodikeys.c
parent3e9345edd8562dc4f9bbca88a598c91c8779a9c4 (diff)
parent7b8ddb06e54ad98edeb7951f317aee4d1feda9d6 (diff)
downloadop-kernel-dev-e38c1e54ce51059a1aa8744c895762906cf43b32.zip
op-kernel-dev-e38c1e54ce51059a1aa8744c895762906cf43b32.tar.gz
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: DMAENGINE: DMA40 U8500 platform configuration DMA: PL330: Add dma api driver
Diffstat (limited to 'drivers/hid/hid-prodikeys.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud