Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit9063974cdbc5463528cb6aa60c91bc0267af7bbb
authorJiri Kosina <jkosina@suse.cz>
Wed, 23 Jul 2008 13:19:00 +0000 (23 15:19 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 23 Jul 2008 13:19:00 +0000 (23 15:19 +0200)
tree1dffc62d8b79b3d89459cf23aa59c553e186840a
parentd6d6a86e14a6b5a26c785b45268874a8f7a52b4d
parentc010b2f76c3032e48097a6eef291d8593d5d79a6
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6