summaryrefslogtreecommitdiffstats
path: root/drivers/media/IR/keymaps/rc-pixelview-mk12.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 20:17:43 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 20:17:43 +0200
commitd515e86e639890b33a09390d062b0831664f04a2 (patch)
tree37aea609704ce28ad44840279b95725e07c19a43 /drivers/media/IR/keymaps/rc-pixelview-mk12.c
parentMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow... (diff)
parentudf: BKL ioctl pushdown (diff)
downloadlinux-d515e86e639890b33a09390d062b0831664f04a2.tar.xz
linux-d515e86e639890b33a09390d062b0831664f04a2.zip
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: udf: BKL ioctl pushdown
Diffstat (limited to 'drivers/media/IR/keymaps/rc-pixelview-mk12.c')
0 files changed, 0 insertions, 0 deletions