diff options
author | 2009-12-08 13:35:29 -0800 | |
---|---|---|
committer | 2009-12-08 13:35:29 -0800 | |
commit | 830cd2ac6ecce6b027d947fcdc724dd27a33813a (patch) | |
tree | 08d4f60e9176292f98e47d1f50b77f1f49ec0122 /kernel/hrtimer.c | |
parent | Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | vgacon: Add support for setting the default cursor state (diff) | |
download | linux-dev-830cd2ac6ecce6b027d947fcdc724dd27a33813a.tar.xz linux-dev-830cd2ac6ecce6b027d947fcdc724dd27a33813a.zip |
Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel/hrtimer.c')
0 files changed, 0 insertions, 0 deletions