Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorAdrian Bunk <bunk@stusta.de>
Fri, 3 Feb 2006 22:49:49 +0000 (23:49 +0100)
committerAdrian Bunk <bunk@r063144.stusta.swh.mhn.de>
Fri, 3 Feb 2006 22:49:49 +0000 (23:49 +0100)
commit01d206a7c1167639f6ca6dac22140fbdca017558
treebc3ccf1a8140a7f787c4728cfa4c30e65ad56eb2
parent9c4b562abc9005e4b413de02c85d3d29da707cba
parentd6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f
Merge ... git://git./linux/kernel/git/torvalds/linux-2.6.git
drivers/char/ip2/ip2main.c