Merge tag 'tty-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Mar 2012 00:10:27 +0000 (16:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Mar 2012 00:10:27 +0000 (16:10 -0800)
commit75d7b398b74f86244fbb46ea9005438ae0aa33c8
tree9fe448e66084acdc2a100178932da5b448dbce46
parenta2e5f13ce806e79b5a234f9653a2a245424e29fa
parentf21c6d4a49179f91fd70a41382382f08c780d425
Merge tag 'tty-3.3-rc6' of git://git./linux/kernel/git/gregkh/tty

tty: build fix for 3.3-rc6

This contains one build fix for the powerpc udbg driver that was reported.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* tag 'tty-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty/powerpc: early udbg consoles can't be modules