Merge branch 'linus'
authorTony Lindgren <tony@atomide.com>
Thu, 30 Apr 2009 19:38:38 +0000 (12:38 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 30 Apr 2009 19:38:38 +0000 (12:38 -0700)
Conflicts:
drivers/Makefile


Trivial merge