Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 21:35:29 +0000 (13:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 21:35:29 +0000 (13:35 -0800)
commit830cd2ac6ecce6b027d947fcdc724dd27a33813a
tree08d4f60e9176292f98e47d1f50b77f1f49ec0122
parent64227cd83d5f9d7b7ce5514a693252c2952366f6
parentb434a680a29424856e0f40199daa9f65963c7cb4
Merge branch 'x86-setup-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  vgacon: Add support for setting the default cursor state
  vc: Add support for hiding the cursor when creating VTs
  x86, setup: Store the boot cursor state
Documentation/kernel-parameters.txt