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
..
2011-09-27 18:08:04 +02:00
2012-04-05 17:02:52 -07:00
2008-02-01 14:34:47 -08:00
2006-11-30 04:55:36 +01:00
2012-04-05 17:02:52 -07:00