Merge branch 'master' of git://git.buildroot.net/~ulf/git/linux
authorPeter Korsgaard <jacmet@sunsite.dk>
Sat, 25 Jul 2009 06:46:45 +0000 (08:46 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sat, 25 Jul 2009 06:46:45 +0000 (08:46 +0200)

Trivial merge