Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 14 Jan 2006 18:42:40 +0000 (10:42 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 14 Jan 2006 18:42:40 +0000 (10:42 -0800)
commit3e2b32b69308e974cd1167beaf266d3c716e4734
tree0f1b24dcb7b066a6322d33235b95655d885695ac
parent3824ba7df91745da6ebac703c87c3b801c34fdd0
parent9c08a938ce5a3e1c9d5f764dc6ae844cb1af76ff
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6