From: Michal Marek <mmarek@suse.cz>
Date: Wed, 27 Oct 2010 22:54:25 +0000 (+0200)
Subject: Merge branch 'message-callback' into kbuild/kconfig
X-Git-Tag: v2.6.37-rc1~51^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70c74e59db7450d5c9164abeb3b6752f8045288b;p=pandora-kernel.git

Merge branch 'message-callback' into kbuild/kconfig

Conflicts:
	scripts/kconfig/nconf.c
---

70c74e59db7450d5c9164abeb3b6752f8045288b
Reading git-diff-tree failed