Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit7b7e394185014e0f3bd8989cac937003f20ef9ce
authorDmitry Torokhov <dtor_core@ameritech.net>
Sat, 29 Apr 2006 05:11:23 +0000 (29 01:11 -0400)
committerDmitry Torokhov <dtor_core@ameritech.net>
Sat, 29 Apr 2006 05:11:23 +0000 (29 01:11 -0400)
tree3beda5f979bba0aa9822534e239cf1b45f3be69c
parentddc5d3414593e4d7ad7fbd33e7f7517fcc234544
parent693f7d362055261882659475d2ef022e32edbff1
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6