Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit2d4b3f37ded8998a362c8d0b4be02f583dd9a002
authorJiri Kosina <jkosina@suse.cz>
Tue, 20 May 2008 14:43:50 +0000 (20 16:43 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 20 May 2008 14:43:50 +0000 (20 16:43 +0200)
tree5c66ddaf0a6ab6d898931a5ed58c7aa844b94740
parent7022b15e2a9f878fd5184586064c63352c3dd225
parent8033c6e9736c29cce5f0d0abbca9a44dffb20c39
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6