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-28 18:30:01 +01:00
2005-04-16 15:20:36 -07:00
2009-12-18 16:07:53 +00:00