Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Aug 2010 23:15:12 +0000 (16:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Aug 2010 23:15:12 +0000 (16:15 -0700)
commitce06ea8339de1dca3455e9c89c56ea161988ab71
treeef6e12f96bbe0c78e6cd0ad1fc6fc679b80808e0
parent17879857821adad4e180c5d6457c3b8bbf1d0c0c
parent9261ec1a8d7b17e2540bef7cad3470870d13b61e
Merge branch 'for_linus' of git://git./linux/kernel/git/jwessel/linux-2.6-kgdb

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
  console: Fix compilation regression