Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 10 Aug 2010 11:22:08 +0000 (13:22 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 10 Aug 2010 11:22:08 +0000 (13:22 +0200)
Conflicts:
arch/arm/mach-omap1/board-nokia770.c

1  2 
drivers/base/core.c
drivers/net/igb/igb_main.c
kernel/trace/trace_kprobe.c

Simple merge
Simple merge
Simple merge