]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'kconfig/for-linus-2' into kconfig/for-next
authorSteven Rostedt <rostedt@goodmis.org>
Wed, 3 Feb 2010 18:18:33 +0000 (13:18 -0500)
committerSteven Rostedt <rostedt@goodmis.org>
Wed, 3 Feb 2010 18:18:33 +0000 (13:18 -0500)

Trivial merge