sugar/linux
1
0
Fork 0
Code Activity
Files
aad3bf04dca5a2147a8406f7aef5703ee5259a52
linux/drivers/char
History
Linus Torvalds 11bd04f6f3 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (109 commits)
  PCI: fix coding style issue in pci_save_state()
  PCI: add pci_request_acs
  PCI: fix BUG_ON triggered by logical PCIe root port removal
  PCI: remove ifdefed pci_cleanup_aer_correct_error_status
  PCI: unconditionally clear AER uncorr status register during cleanup
  x86/PCI: claim SR-IOV BARs in pcibios_allocate_resource
  PCI: portdrv: remove redundant definitions
  PCI: portdrv: remove unnecessary struct pcie_port_data
  PCI: portdrv: minor cleanup for pcie_port_device_register
  PCI: portdrv: add missing irq cleanup
  PCI: portdrv: enable device before irq initialization
  PCI: portdrv: cleanup service irqs initialization
  PCI: portdrv: check capabilities first
  PCI: portdrv: move PME capability check
  PCI: portdrv: remove redundant pcie type calculation
  PCI: portdrv: cleanup pcie_device registration
  PCI: portdrv: remove redundant pcie_port_device_probe
  PCI: Always set prefetchable base/limit upper32 registers
  PCI: read-modify-write the pcie device control register when initiating pcie flr
  PCI: show dma_mask bits in /sys
  ...

Fixed up conflicts in:
	arch/x86/kernel/amd_iommu_init.c
	drivers/pci/dmar.c
	drivers/pci/hotplug/acpiphp_glue.c
2009-12-11 12:18:16 -08:00
..
agp
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2009-12-10 21:56:47 -08:00
hw_random
Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-09 08:07:38 -08:00
ip2
tty: rewrite the ldisc locking
2009-06-11 08:51:01 -07:00
ipmi
sysctl: Drop & in front of every proc_handler.
2009-11-18 08:37:40 -08:00
mwave
mwave: fix read buffer overflow
2009-09-24 07:21:03 -07:00
pcmcia
pcmcia: rework the irq_req_t typedef
2009-11-28 18:03:14 +01:00
rio
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
tpm
tpm: autoload tpm_tis based on system PnP IDs
2009-11-03 12:05:50 +11:00
xilinx_hwicap
const: constify remaining file_operations
2009-10-01 16:11:11 -07:00
.gitignore
…
amiserial.c
headers: smp_lock.h redux
2009-07-12 12:22:34 -07:00
apm-emulation.c
const: constify remaining file_operations
2009-10-01 16:11:11 -07:00
applicom.c
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
applicom.h
…
bfin_jtag_comm.c
bfin_jtag_comm: clean up printk usage
2009-06-22 11:32:23 -07:00
bfin-otp.c
const: constify remaining file_operations
2009-10-01 16:11:11 -07:00
briq_panel.c
…
bsr.c
powerpc/BSR: Fix BSR to allow mmap of small BSR on 64k kernel
2009-06-26 14:37:26 +10:00
cd1865.h
…
ChangeLog
…
consolemap.c
…
cp437.uni
…
cs5535_gpio.c
drivers: Remove BKL from cs5535_gpio
2009-10-14 17:36:48 +02:00
cyclades.c
cyclades: fix read buffer overflow
2009-10-01 16:11:16 -07:00
defkeymap.c_shipped
…
defkeymap.map
…
digi1.h
…
digiFep1.h
…
digiPCI.h
…
ds1302.c
…
ds1620.c
…
dsp56k.c
…
dtlk.c
headers: remove sched.h from poll.h
2009-10-04 15:05:10 -07:00
efirtc.c
rtc: Remove BKL from efirtc
2009-10-14 17:36:51 +02:00
epca.c
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
epca.h
…
epcaconfig.h
…
esp.c
serial: move delta_msr_wait into the tty_port
2009-09-19 13:13:31 -07:00
generic_nvram.c
nvram: Drop the bkl from nvram_llseek()
2009-10-14 17:36:49 +02:00
generic_serial.c
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
genrtc.c
headers: Fix build after <linux/sched.h> removal
2009-10-13 10:20:16 -07:00
hangcheck-timer.c
…
hpet.c
sysctl: Drop & in front of every proc_handler.
2009-11-18 08:37:40 -08:00
hvc_beat.c
…
hvc_console.c
hvc_console: Provide (un)locked version for hvc_resize()
2009-09-24 15:12:47 +10:00
hvc_console.h
hvc_console: Provide (un)locked version for hvc_resize()
2009-09-24 15:12:47 +10:00
hvc_irq.c
…
hvc_iseries.c
drivers/hvc: Add missing __devexit_p()
2009-06-16 14:15:44 +10:00
hvc_iucv.c
hvc_console: Provide (un)locked version for hvc_resize()
2009-09-24 15:12:47 +10:00
hvc_rtas.c
…
hvc_udbg.c
…
hvc_vio.c
hvc_console: Add __init and __exit to hvc_vio
2009-08-28 14:24:11 +10:00
hvc_xen.c
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2009-12-11 12:18:16 -08:00
hvcs.c
Merge commit 'origin/master' into next
2009-06-18 11:16:55 +10:00
hvsi.c
powerpc/hvsi: Avoid calculating possibly-invalid address
2009-08-20 10:29:28 +10:00
i8k.c
…
isicom.c
isicom: split the open method for the isicom device
2009-09-19 13:13:27 -07:00
istallion.c
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
Kconfig
tty: Mark generic_serial users as BROKEN
2009-10-30 14:43:12 -07:00
keyboard.c
Merge commit 'v2.6.32' into next
2009-12-02 23:38:13 -08:00
lp.c
…
Makefile
drivers/char/uv_mmtimer.c: add memory mapped RTC driver for UV
2009-09-24 07:21:03 -07:00
mbcs.c
[IA64] mbcs: fix printk format warnings
2009-09-15 08:42:00 -07:00
mbcs.h
…
mem.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-12-09 19:43:33 -08:00
misc.c
drivers: Remove BKL from misc_open
2009-10-14 17:33:32 +02:00
mmtimer.c
…
moxa.c
headers: smp_lock.h redux
2009-07-12 12:22:34 -07:00
moxa.h
…
mspec.c
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
mxser.c
tty: Char: mxser, use THRE for ASPP_OQUEUE ioctl
2009-09-19 13:13:38 -07:00
mxser.h
…
n_hdlc.c
headers: smp_lock.h redux
2009-07-12 12:22:34 -07:00
n_r3964.c
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
n_tty.c
n_tty: move echoctl check and clean up logic
2009-09-19 13:13:34 -07:00
nozomi.c
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
nsc_gpio.c
…
nvram.c
nvram: Fix missing smp_lock.h in nvram
2009-12-09 18:53:23 -08:00
nwbutton.c
…
nwbutton.h
…
nwflash.c
…
pc8736x_gpio.c
drivers: Remove BKL from pc8736x_gpio
2009-10-14 17:36:52 +02:00
ppdev.c
ppdev: reduce kernel log spam
2009-06-18 13:03:54 -07:00
ps3flash.c
ps3flash: Always read chunks of 256 KiB, and cache them
2009-06-15 16:47:27 +10:00
pty.c
sysctl: Drop & in front of every proc_handler.
2009-11-18 08:37:40 -08:00
random.c
sysctl: Drop & in front of every proc_handler.
2009-11-18 08:37:40 -08:00
raw.c
Driver-Core: extend devnode callbacks to provide permissions
2009-09-19 12:50:38 -07:00
riscom8_reg.h
…
riscom8.c
tty: riscom8, fix tty refcnt
2009-09-19 13:13:37 -07:00
riscom8.h
…
rocket_int.h
…
rocket.c
headers: smp_lock.h redux
2009-07-12 12:22:34 -07:00
rocket.h
…
rtc.c
sysctl: Drop & in front of every proc_handler.
2009-11-18 08:37:40 -08:00
scc.h
…
scx200_gpio.c
drivers: Remove BKL from scx200_gpio
2009-10-14 17:36:53 +02:00
selection.c
tty: rewrite the ldisc locking
2009-06-11 08:51:01 -07:00
ser_a2232.c
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
ser_a2232.h
…
ser_a2232fw.ax
…
ser_a2232fw.h
…
serial167.c
serial167: fix read buffer overflow
2009-10-01 16:11:16 -07:00
snsc_event.c
…
snsc.c
…
snsc.h
…
sonypi.c
headers: Fix build after <linux/sched.h> removal
2009-10-13 10:20:16 -07:00
specialix_io8.h
…
specialix.c
specialix.c: convert nested spin_lock_irqsave to spin_lock
2009-07-20 16:38:43 -07:00
stallion.c
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
sx.c
headers: smp_lock.h redux
2009-07-12 12:22:34 -07:00
sx.h
…
sxboards.h
…
sxwindow.h
…
synclink_gt.c
hdlc: convert to netdev_tx_t
2009-09-01 01:13:31 -07:00
synclink.c
hdlc: convert to netdev_tx_t
2009-09-01 01:13:31 -07:00
synclinkmp.c
hdlc: convert to netdev_tx_t
2009-09-01 01:13:31 -07:00
sysrq.c
perf: Do the big rename: Performance Counters -> Performance Events
2009-09-21 14:28:04 +02:00
tb0219.c
mips: Remove BKL from tb0219
2009-10-14 17:36:53 +02:00
tlclk.c
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
toshiba.c
…
tty_audit.c
tty: remove buffer special casing
2009-06-11 08:51:02 -07:00
tty_buffer.c
tty: use the new 'flush_delayed_work()' helper to do ldisc flush
2009-10-14 09:20:41 -07:00
tty_io.c
tty: Fix regressions caused by commit b50989dc
2009-09-27 13:35:16 -07:00
tty_ioctl.c
tree-wide: fix a very frequent spelling mistake
2009-11-09 09:40:54 +01:00
tty_ldisc.c
tty: Avoid dropping ldisc_mutex over hangup tty re-initialization
2009-10-03 21:44:21 -07:00
tty_port.c
tty_port: handle the nonblocking open of a dead port corner case
2009-11-30 16:38:25 -08:00
uv_mmtimer.c
drivers/char/uv_mmtimer.c: add memory mapped RTC driver for UV
2009-09-24 07:21:03 -07:00
vc_screen.c
vc: create vcs(a) devices for consoles
2009-07-20 16:38:43 -07:00
viotape.c
tape: beyond ARRAY_SIZE of viocd_diskinfo
2009-06-02 10:32:34 +10:00
virtio_console.c
virtio: let header files include virtio_ids.h
2009-10-22 16:39:28 +10:30
vme_scc.c
…
vt_ioctl.c
vt: Fix use of "new" in a struct field
2009-11-19 13:43:06 -08:00
vt.c
vc: Add support for hiding the cursor when creating VTs
2009-11-13 15:54:27 -08:00