iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
Linus Torvalds 5b34653963 Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 
* 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
  x86: canonicalize remaining header guards
  x86: drop double underscores from header guards
  x86: Fix ASM_X86__ header guards
  x86, um: get rid of uml-config.h
  x86, um: get rid of arch/um/Kconfig.arch
  x86, um: get rid of arch/um/os symlink
  x86, um: get rid of excessive includes of uml-config.h
  x86, um: get rid of header symlinks
  x86, um: merge Kconfig.i386 and Kconfig.x86_64
  x86, um: get rid of sysdep symlink
  x86, um: trim the junk from uml ptrace-*.h
  x86, um: take vm-flags.h to sysdep
  x86, um: get rid of uml asm/arch
  x86, um: get rid of uml highmem.h
  x86, um: get rid of uml unistd.h
  x86, um: get rid of system.h -> system.h include
  x86, um: uml atomic.h is not needed anymore
  x86, um: untangle uml ldt.h
  x86, um: get rid of more uml asm/arch uses
  x86, um: remove dead header (uml module-generic.h; never used these days)
  ...
2008-10-23 10:22:01 -07:00
..
accessibility
braille_console: only register notifiers when the braille console is used
2008-10-02 15:53:13 -07:00
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2008-10-23 10:20:36 -07:00
amba
…
ata
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2008-10-23 10:20:36 -07:00
atm
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-10-11 12:39:35 -07:00
auxdisplay
…
base
memory_probe: fix wrong sysfs file attribute
2008-10-20 08:52:32 -07:00
block
x86: sysfs: kill owner field from attribute
2008-10-20 08:52:42 -07:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
cdrom
gdrom: change to use __blk_end_request()
2008-10-09 08:56:21 +02:00
char
tty: Fix tty_port kref screwup
2008-10-23 09:20:53 -07:00
clocksource
Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/debug' into v28-timers-for-linus
2008-10-20 13:14:06 +02:00
connector
…
cpufreq
[CPUFREQ] Fix BUG: using smp_processor_id() in preemptible code
2008-10-09 13:52:44 -04:00
cpuidle
cpuidle: upon BIOS bug, default to default_idle rather than polling
2008-10-16 19:00:08 -04:00
crypto
crypto: talitos - Avoid consecutive packets going out with same IV
2008-09-14 13:41:19 -07:00
dca
device create: misc: convert device_create_drvdata to device_create
2008-10-16 09:24:43 -07:00
dio
…
dma
Merge branch 'linus' into test
2008-10-23 00:11:07 -04:00
edac
edac cell: fix incorrect edac_mode
2008-10-20 08:52:40 -07:00
eisa
…
firewire
firewire: fix ioctl() return code
2008-10-15 22:21:10 +02:00
firmware
x86: sysfs: kill owner field from attribute
2008-10-20 08:52:42 -07:00
gpio
mfd: twl4030-gpio driver
2008-10-22 01:19:39 +02:00
gpu
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2008-10-23 10:18:40 -07:00
hid
USB: remove warn macro from HID core
2008-10-17 14:41:09 -07:00
hwmon
hwmon: applesmc: lighter wait mechanism, drastic improvement
2008-10-20 08:52:35 -07:00
i2c
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
2008-10-23 10:10:25 -07:00
ide
ide: remove useless subdirs from drivers/ide/
2008-10-21 20:57:23 +02:00
idle
i7300_idle driver v1.55
2008-10-21 23:58:41 -04:00
ieee1394
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2008-10-16 15:02:24 -07:00
infiniband
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2008-10-23 08:16:03 -07:00
input
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
2008-10-20 09:22:47 -07:00
isdn
device create: misc: convert device_create_drvdata to device_create
2008-10-16 09:24:43 -07:00
leds
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
2008-10-20 13:12:39 -07:00
lguest
…
macintosh
device create: misc: convert device_create_drvdata to device_create
2008-10-16 09:24:43 -07:00
mca
…
md
dm: tidy local_init
2008-10-21 17:45:08 +01:00
media
V4L/DVB (9336): cx88: always de-alloc frontends on fault condition
2008-10-21 14:32:12 -02:00
memstick
x86: sysfs: kill owner field from attribute
2008-10-20 08:52:42 -07:00
message
i2o: Fix 32/64bit DMA locking
2008-10-16 11:21:38 -07:00
mfd
mfd: check for platform_get_irq() return value in sm501
2008-10-22 01:39:55 +02:00
misc
intel_menlo: fix build warning
2008-10-23 00:43:47 -04:00
mmc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
2008-10-20 10:17:42 -07:00
mtd
Merge git://git.infradead.org/mtd-2.6
2008-10-20 09:03:12 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
2008-10-23 09:16:56 -07:00
nubus
nubus: fix mis-indented statement
2008-10-16 11:21:30 -07:00
of
Merge commit 'kumar/kumar-for-2.6.28'
2008-10-21 15:49:55 +11:00
oprofile
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile
2008-10-23 10:05:40 -07:00
parisc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
2008-10-20 14:40:31 -07:00
parport
8250: Oxford Semiconductor Devices
2008-10-23 09:31:09 -07:00
pci
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2008-10-23 10:20:36 -07:00
pcmcia
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-10-23 08:12:21 -07:00
pnp
Merge branch 'linus' into test
2008-10-23 00:11:07 -04:00
power
Merge git://git.infradead.org/battery-2.6
2008-10-20 09:44:30 -07:00
ps3
ps3: Add passthru support for non-audio streams
2008-10-20 08:05:15 +02:00
rapidio
…
regulator
da903x: add regulator support for DA9030/DA9034
2008-10-13 21:51:57 +01:00
rtc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2008-10-23 10:20:15 -07:00
s390
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2008-10-17 09:29:55 -07:00
sbus
sparc: Kill sbus mostek RTC driver.
2008-09-03 15:55:32 -07:00
scsi
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2008-10-20 13:40:47 -07:00
serial
8250: Add more OxSemi devices
2008-10-23 09:35:18 -07:00
sh
sh: Move the shared INTC code out to drivers/sh/
2008-10-01 16:13:54 +09:00
sn
…
spi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2008-10-16 12:40:26 -07:00
ssb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
staging
Staging: usbip: fix build warning on 64bit kernels
2008-10-22 09:56:40 -07:00
tc
…
telephony
phonedev: remove BKL
2008-10-20 08:52:36 -07:00
thermal
…
uio
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
2008-10-20 13:42:14 -07:00
usb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2008-10-23 10:09:50 -07:00
uwb
uwb: wrong sizeof argument in mac address compare
2008-10-20 14:37:53 +01:00
video
Remove empty imacfb.c file
2008-10-20 11:32:09 -07:00
virtio
…
w1
x86: sysfs: kill owner field from attribute
2008-10-20 08:52:42 -07:00
watchdog
watchdog: Fix warning
2008-10-23 09:19:47 -07:00
xen
x86, um: ... and asm-x86 move
2008-10-22 22:55:20 -07:00
zorro
…
Kconfig
Merge branch 'master' into for-upstream
2008-10-20 16:07:19 +01:00
Makefile
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2008-10-23 10:20:36 -07:00