Jiri Kosina e75d660672
Merge branch 'master' into for-next ...
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
2012-04-08 21:48:52 +02:00
2012-03-30 16:09:02 -07:00
2012-03-06 18:46:48 +01:00
2012-03-16 10:38:24 -04:00
2012-04-05 16:58:23 -07:00
2012-03-28 13:56:35 -07:00
2012-03-06 18:46:52 +01:00
2012-03-30 16:09:02 -07:00
2012-03-16 21:12:32 +01:00
2012-03-16 20:59:19 +01:00
2012-03-16 19:45:08 +01:00
2012-03-21 21:39:18 +01:00
2012-03-16 20:05:45 +01:00
2012-03-28 13:56:35 -07:00
2012-03-16 10:38:24 -04:00
2012-03-27 12:20:16 -04:00
2012-03-20 16:56:33 +01:00
2012-03-28 14:08:46 -07:00
e75d660672