linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-01 08:07:38 -05:00

Files

Linus Torvalds 708e16892e Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
  Add missing maintainer countries in CREDITS
  Fix bytes <-> kilobytes  typo in Kconfig for ramdisk
  fix a typo in Documentation/pi-futex.txt
  BUG_ON conversion for fs/xfs/
  BUG_ON() conversion in fs/nfsd/
  BUG_ON conversion for fs/reiserfs
  BUG_ON cleanups in arch/i386
  BUG_ON cleanup in drivers/net/tokenring/
  BUG_ON cleanup for drivers/md/
  kerneldoc-typo in led-class.c
  debugfs: spelling fix
  rcutorture: Fix incorrect description of default for nreaders parameter
  parport: Remove space in function calls
  Michal Wronski: update contact info
  Spelling fix: "control" instead of "cotrol"
  reboot parameter in Documentation/kernel-parameters.txt
  Fix copy&waste bug in comment in scripts/kernel-doc
  remove duplicate "until" from kernel/workqueue.c
  ite_gpio fix tabbage
  fix file specification in comments
  ...

Fixed trivial path conflicts due to removed files:
   arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c

2006-10-03 16:35:11 -07:00

agp

[AGPGART] printk fixups.

2006-09-28 19:50:07 -04:00

drm

drm: Use register writes instead of BITBLT_MULTI packets for buffer swap blits

2006-09-22 05:32:34 +10:00

ftape

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

hw_random

fix file specification in comments

2006-10-03 23:01:26 +02:00

ip2

[PATCH] drivers/char/ip2: kill unused code, label

2006-10-03 08:03:41 -07:00

ipmi

[PATCH] IPMI: allow user to override the kernel IPMI daemon enable

2006-10-03 08:03:42 -07:00

mwave

remove mentionings of devfs in documentation

2006-10-03 22:17:48 +02:00

pcmcia

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

2006-10-03 09:13:29 -07:00

rio

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

tpm

Merge branch 'merge'

2006-08-01 10:37:25 +10:00

watchdog

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

2006-10-03 16:35:11 -07:00

.gitignore

[MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.

2006-10-03 17:59:17 +01:00

amiserial.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

applicom.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

applicom.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

briq_panel.c

[PATCH] briq_panel: read() and write() get __user pointers, damnit

2006-09-23 11:34:43 -07:00

cd1865.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ChangeLog

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

consolemap.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

cp437.uni

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cs5535_gpio.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

cyclades.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

decserial.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

defkeymap.c_shipped

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

defkeymap.map

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

digi1.h

[PATCH] Clean up the old digi support and rescue it

2005-09-07 16:57:20 -07:00

digi.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

digiFep1.h

[PATCH] Clean up the old digi support and rescue it

2005-09-07 16:57:20 -07:00

digiPCI.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ds1286.c

[PATCH] proper flags type of spin_lock_irqsave()

2006-10-01 00:39:21 -07:00

ds1302.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

ds1620.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

dsp56k.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

dtlk.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

ec3104_keyb.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

efirtc.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

epca.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

epca.h

[PATCH] epca iomem annotations + several missing readw()

2005-09-16 10:38:10 -07:00

epcaconfig.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

esp.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

generic_nvram.c

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

generic_serial.c

[PATCH] generic_serial: remove private decoding of baud rate bits

2006-09-29 09:18:24 -07:00

genrtc.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

hangcheck-timer.c

[PATCH] hangcheck: remove monotomic_clock on x86

2006-06-26 09:58:20 -07:00

hpet.c

[PATCH] Don't print virtual address in HPET initialization

2006-09-26 10:52:28 +02:00

hvc_console.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

hvc_console.h

[POWERPC] Make the hvc_console output buffer size settable

2006-07-13 18:53:32 +10:00

hvc_iseries.c

[POWERPC] fix spin lock nesting in hvc_iseries

2006-09-26 15:41:03 +10:00

hvc_rtas.c

[POWERPC] Make the hvc_console output buffer size settable

2006-07-13 18:53:32 +10:00

hvc_vio.c

[POWERPC] pseries: Constify & voidify get_property()

2006-07-31 15:55:04 +10:00

hvcs.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

hvsi.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

i8k.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

ip27-rtc.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

isicom.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

istallion.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

Kconfig

[MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.

2006-10-03 17:59:17 +01:00

keyboard.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2006-10-02 08:20:33 -07:00

lcd.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

lcd.h

Resurrect Cobalt support for 2.6.

2005-10-29 19:30:42 +01:00

lp.c

[PATCH] There is no devfs, there has never been a devfs, we have always been at war with...

2006-09-29 09:18:10 -07:00

Makefile

[MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.

2006-10-03 17:59:17 +01:00

mbcs.c

[PATCH] MBCS: Use SEEK_{SET, CUR, END} instead of hardcoded values

2006-10-01 00:39:21 -07:00

mbcs.h

[PATCH] mbcs trivial user annotations

2005-05-04 07:33:13 -07:00

mem.c

[PATCH] mem driver: fix conditional on isa i/o support

2006-09-29 09:18:22 -07:00

misc.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

mmtimer.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

moxa.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

mspec.c

[PATCH] mspec driver

2006-09-27 08:26:13 -07:00

mxser.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

mxser.h

[PATCH] Typo fixes

2006-03-28 09:16:08 -08:00

n_hdlc.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

n_r3964.c

[PATCH] R3964: fix GFP_KERNEL allocations in timer function

2006-06-25 10:01:17 -07:00

n_tty.c

[PATCH] remove TTY_DONT_FLIP

2006-06-28 14:59:05 -07:00

nsc_gpio.c

[PATCH] gpio: cosmetics: remove needless newlines

2006-07-14 21:53:54 -07:00

nvram.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

nwbutton.c

[PATCH] replace cad_pid by a struct pid

2006-10-02 07:57:25 -07:00

nwbutton.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nwflash.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

pc8736x_gpio.c

[PATCH] drivers/char/pc8736x_gpio.c: remove unused static functions

2006-09-29 09:18:05 -07:00

ppdev.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

pty.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

qtronix.c

[PATCH] irq-flags: drivers/char: Use the new IRQF_ constants

2006-07-02 13:58:49 -07:00

random.c

[PATCH] namespaces: utsname: switch to using uts namespaces

2006-10-02 07:57:21 -07:00

raw.c

[PATCH] Streamline generic_file_* interfaces and filemap cleanups

2006-10-01 00:39:28 -07:00

riscom8_reg.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

riscom8.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

riscom8.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rocket_int.h

[PATCH] drivers/char/rocket.c: cleanups

2005-06-25 16:25:04 -07:00

rocket.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

rocket.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rtc.c

[PATCH] remove unnecessary barrier in rtc_get_rtc_time

2006-09-29 09:18:05 -07:00

scan_keyb.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

scan_keyb.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

scc.h

[PATCH] m68k: static vs. extern in scc.h

2006-01-12 09:09:00 -08:00

scx200_gpio.c

[PATCH] scx200_gpio export cleanups

2006-09-29 09:18:06 -07:00

selection.c

[PATCH] tty locking on resize

2006-09-29 09:18:12 -07:00

ser_a2232.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

ser_a2232.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ser_a2232fw.ax

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ser_a2232fw.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

serial167.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

snsc_event.c

[PATCH] replace cad_pid by a struct pid

2006-10-02 07:57:25 -07:00

snsc.c

[IA64] add platform check to snsc driver init

2006-08-02 16:07:55 -07:00

snsc.h

[IA64-SGI] Handle SC env. powerdown events

2006-01-26 13:32:26 -08:00

sonypi.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

specialix_io8.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

specialix.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

stallion.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

sx.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

sx.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sxboards.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sxwindow.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

synclink_gt.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

synclink.c

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

2006-10-03 09:13:29 -07:00

synclinkmp.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

sysrq.c

[PATCH] sysrq: disable lockdep on reboot

2006-10-01 00:39:24 -07:00

tb0219.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

tipar.c

[PATCH] pr_debug: tipar: repair nonexistant pr_debug argument use

2006-10-03 08:04:19 -07:00

tlclk.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

toshiba.c

[PATCH] make more file_operation structs static

2006-07-03 15:26:59 -07:00

tty_io.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

tty_ioctl.c

[PATCH] Fix locking for tty drivers when doing urgent characters

2006-09-29 09:18:24 -07:00

vc_screen.c

[PATCH] There is no devfs, there has never been a devfs, we have always been at war with...

2006-09-29 09:18:10 -07:00

viocons.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

viotape.c

[POWERPC] iseries: Small viotape cleanup allowed by devfs removal

2006-07-13 18:56:00 +10:00

vme_scc.c

[PATCH] const struct tty_operations

2006-10-02 07:57:14 -07:00

vr41xx_giu.c

[MIPS] vr41xx: Move IRQ numbers to asm-mips/vr41xx/irq.h

2006-07-13 21:26:19 +01:00

vt_ioctl.c

[PATCH] vt: Make vt_pid a struct pid (making it pid wrap around safe).

2006-10-02 07:57:14 -07:00

vt.c

[PATCH] vt: proper prototypes for some console functions

2006-10-03 08:04:12 -07:00