summaryrefslogtreecommitdiff
path: root/drivers/input/serio/i8042-x86ia64io.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-02 15:40:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-02 15:40:37 -0800
commit0a45281f8eb49df1bfe0138ffcc76708bdcac875 (patch)
tree6d862e658721de55a4ad1f205c66ad3cf3832673 /drivers/input/serio/i8042-x86ia64io.h
parentf066a4f6df68f03b565dfe867dde54dfeb26576e (diff)
parentd0e260782c3702a009645c3caa02e381dab8798b (diff)
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: md: revert incorrect fix for read error handling in raid1.
Diffstat (limited to 'drivers/input/serio/i8042-x86ia64io.h')
0 files changed, 0 insertions, 0 deletions