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
..
alsa	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
oss	Merge branch 'master' into for-next	2012-04-08 21:48:52 +02:00