Merge branch 'master' of /home/sam/kernel/linux-2.6/
authorSam Ravnborg <sam@mars.ravnborg.org>
Mon, 3 Jul 2006 21:24:23 +0000 (23:24 +0200)
committerSam Ravnborg <sam@mars.ravnborg.org>
Mon, 3 Jul 2006 21:24:23 +0000 (23:24 +0200)

Trivial merge