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

..

x86

Merge branch 'master' into for-next

2012-04-08 21:48:52 +02:00

Kconfig

Kconfig: Remove useless and sometimes wrong comments

2009-11-09 09:40:56 +01:00

Makefile

…