]> err.no Git - linux-2.6/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 master
authorTollef Fog Heen <tfheen@err.no>
Wed, 17 Sep 2008 20:07:19 +0000 (22:07 +0200)
committerTollef Fog Heen <tfheen@err.no>
Wed, 17 Sep 2008 20:07:19 +0000 (22:07 +0200)

Trivial merge