tree ce595adde342f57f379d277b25e4dd206988a052
parent 25cf84cf377c0aae5dbcf937ea89bc7893db5176
parent 3e58974027b04e84f68b964ef368a6cd758e2f84
author Jiri Kosina <jkosina@suse.cz> 1268063737 +0100
committer Jiri Kosina <jkosina@suse.cz> 1268063737 +0100

Merge branch 'for-next' into for-linus

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c