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)
commitfb8231a8b139035476f2a8aaac837d0099b66dad
tree2875806beb96ea0cdab292146767a5085721dc6a
parent426d31071ac476ea62c62656b242930c17b58c00
parentf6cec0ae58c17522a7bc4e2f39dae19f199ab534
Merge branch 'master' into for-next

Conflicts:
arch/arm/mach-omap1/board-nokia770.c
drivers/base/core.c
drivers/net/igb/igb_main.c
kernel/trace/trace_kprobe.c