Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-28 09:44:56 -07:00
..
2010-10-26 13:57:10 -04:00
2010-10-05 09:08:21 -07:00
2006-11-30 04:58:40 +01:00
2009-08-19 10:40:13 -07:00
2009-06-06 10:28:14 -06:00
2009-05-19 10:23:23 +01:00
2010-03-29 14:28:52 +01:00
2007-07-31 15:39:38 -07:00
2010-05-10 11:56:30 +02:00
2010-07-23 10:02:12 +09:00
2008-09-02 19:21:37 -07:00
2008-07-26 12:00:05 -07:00
2006-11-30 04:58:40 +01:00
2006-12-07 08:39:44 -08:00
2009-01-29 16:34:30 +02:00
2007-02-12 09:48:40 -08:00
2008-11-12 17:17:17 -08:00