diff options
| author | David S. Miller | 2008-10-11 21:39:35 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-10-11 21:39:35 +0200 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /drivers/char/nozomi.c | |
| parent | leo: disable cursor when leaving graphics mode (diff) | |
| parent | Merge phase #4 (X2APIC, APIC unification, CPU identification unification) of ... (diff) | |
| download | kernel-qcow2-linux-56c5d900dbb8e042bfad035d18433476931d8f93.tar.gz kernel-qcow2-linux-56c5d900dbb8e042bfad035d18433476931d8f93.tar.xz kernel-qcow2-linux-56c5d900dbb8e042bfad035d18433476931d8f93.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'drivers/char/nozomi.c')
0 files changed, 0 insertions, 0 deletions