Merge tag 'v3.4' into cbus
authorTony Lindgren <tony@atomide.com>
Mon, 4 Jun 2012 09:57:00 +0000 (02:57 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 4 Jun 2012 09:57:00 +0000 (02:57 -0700)
Linux 3.4


Trivial merge