pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e17ba73 6329d30)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 10 Jul 2008 06:17:14 +0000 (08:17 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 10 Jul 2008 06:17:14 +0000 (08:17 +0200)
commit	9e4144abf8a30ae221311368bbb10690ebdb4b76
tree	032289d5b7d87976675c1a1a32d512a44d234fa2	tree \| snapshot
parent	e17ba73b0ee6c0f24393c48b455e0d8db761782c	commit \| diff
parent	6329d3021bcfa9038621e6e917d98929421d8ec8	commit \| diff

Merge branch 'linus' into core/printk

Conflicts:

kernel/printk.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

include/linux/kernel.h

Unnamed repository; edit this file 'description' to name the repository.