summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-31 15:44:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-31 15:44:08 -0700
commite06f42d6c127883e58b747048752f44ae208ae47 (patch)
tree16b28e067eb7a85259d8a2025fb9256fda55bdc5 /drivers/input/serio
parentf891caf28febf9d4129716e848227148654b5993 (diff)
parentd7dc61d0a70371b1c6557ea8ffbc60fff94c8168 (diff)
downloadblackbird-op-linux-e06f42d6c127883e58b747048752f44ae208ae47.tar.gz
blackbird-op-linux-e06f42d6c127883e58b747048752f44ae208ae47.zip
Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux: NLM: Set address family before calling nlm_host_rebooted() nfsd: fix failure to set eof in readdir in some situations
Diffstat (limited to 'drivers/input/serio')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud