aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/mouse/alps.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-17 15:49:59 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-17 15:49:59 -0800
commit30472908d50cf726a68c2b444127a1dafae8a91c (patch)
tree6277cdad2fe6949b9c7aa160e1de435fe367f18e /drivers/input/mouse/alps.c
parentabde3dff2496d9d44a218cf8e2a17c2383f20b22 (diff)
parente415e6ea0cd36ece29c7b12232286b5ca097ac96 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [NIU]: Fix 1G PHY link state handling. [NET]: Fix TX timeout regression in Intel drivers.
Diffstat (limited to 'drivers/input/mouse/alps.c')
0 files changed, 0 insertions, 0 deletions