diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-02 12:14:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-02 12:14:23 -0400 |
| commit | d9c566198bfdf72a041322a093fdc1a2dc231170 (patch) | |
| tree | 908acd901d8deb0c6ff54323c96cf61d2f005faf /drivers | |
| parent | 17263849c7ad2279667dd298083eceefcd1b5845 (diff) | |
| parent | 0a4949c4414af2eb91414bcd8e2a8ac3706f7dde (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Do not clobber %g7 in setcontext() trap.
sparc64: Kill __show_regs().
sparc: Add __KERNEL__ ifdef protection to pt_regs helpers.
sparc64: Kill smp_report_regs().
sparc64: Kill VERBOSE_SHOWREGS code.
sparc64: Hook up trigger_all_cpu_backtrace().
sparc64: Make global reg dumping even more useful.
sparc: Ignore drivers/video/console/promcon_tbl.c conmakehash generated file
sparc64: FUTEX_OP_ANDN fix
sparc: merge of_platform_{32,64}.h
sparc64: Kill isa_bus_type.
sparc64: Fix global reg snapshotting on self-cpu.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/console/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/console/.gitignore b/drivers/video/console/.gitignore new file mode 100644 index 000000000000..0c258b45439c --- /dev/null +++ b/drivers/video/console/.gitignore | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | # conmakehash generated file | ||
| 2 | promcon_tbl.c | ||