From: Greg Kroah-Hartman Date: Thu, 9 Jun 2011 20:49:02 +0000 (-0700) Subject: Merge Linus's tree into staging-next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dc5a18941b4226846f0c5994e4f45bc685f7bcfe;p=linux-beck.git Merge Linus's tree into staging-next This was done to resolve the conflicts that were in a number of files due to changes done upstream with others done in the staging-next branch. Signed-off-by: Greg Kroah-Hartman --- dc5a18941b4226846f0c5994e4f45bc685f7bcfe