summaryrefslogtreecommitdiffstats
path: root/drivers/oprofile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-17 18:20:50 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-17 18:20:50 +0100
commit5743695b0dd2c775b71d3d4541c243df3da964db (patch)
tree8220816fb97638642671bb66f1f2f02b0fb2f39d /drivers/oprofile
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff)
parentInput: lifebook - fix settings for CF-72 (diff)
downloadlinux-5743695b0dd2c775b71d3d4541c243df3da964db.tar.xz
linux-5743695b0dd2c775b71d3d4541c243df3da964db.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: lifebook - fix settings for CF-72 Input: psmouse - fix breakage introduced by b7802c5c1ea
Diffstat (limited to 'drivers/oprofile')
0 files changed, 0 insertions, 0 deletions