iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
2010-08-16 18:42:58 +01:00
..
accessibility
…
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2010-08-15 17:37:07 -07:00
amba
ARM: AMBA: Add pclk support to AMBA bus infrastructure
2010-07-31 13:07:27 +01:00
ata
Merge branch 'linus' into release
2010-08-15 01:06:31 -04:00
atm
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
auxdisplay
…
base
drivers/base/node.c: reduce stack usage of node_read_meminfo()
2010-08-09 20:45:02 -07:00
block
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
cdrom
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
char
Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2010-08-12 10:01:59 -07:00
clocksource
x86: Convert common clocksources to use clocksource_register_hz/khz
2010-07-27 12:40:55 +02:00
connector
…
cpufreq
[CPUFREQ] fix brace coding style issue.
2010-08-03 13:47:05 -04:00
cpuidle
cpuidle: extend cpuidle and menu governor to handle dynamic states
2010-08-09 20:45:04 -07:00
crypto
[S390] zcrypt: fix Kconfig dependencies
2010-08-13 10:06:54 +02:00
dca
…
dio
…
dma
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
edac
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
eisa
…
firewire
Merge firewire branches to be released post v2.6.35
2010-08-02 10:09:04 +02:00
firmware
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-08-14 12:34:34 -07:00
gpio
gpiolib: Implement set_debounce for WM831x GPIOs
2010-08-12 11:27:57 +02:00
gpu
Merge git://git.infradead.org/~dwmw2/ideapad-2.6
2010-08-13 18:04:52 -07:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-08-10 15:08:02 -07:00
hwmon
hwmon: (via-cputemp) Remove bogus "SHOW" global variable
2010-08-14 21:09:02 +02:00
i2c
Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux
2010-08-14 11:57:54 -07:00
ide
ide: use module_param_named rather than module_param_call
2010-08-11 23:04:39 +09:30
idle
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
2010-08-15 11:17:52 -07:00
ieee1394
Merge firewire branches to be released post v2.6.35
2010-08-02 10:09:04 +02:00
ieee802154
…
infiniband
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
input
Merge branch 'for-2.6.36' into for-2.6.37
2010-08-16 18:42:58 +01:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-08-13 10:38:12 -07:00
leds
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
lguest
…
macintosh
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-08-12 10:06:29 -07:00
mca
…
md
dm mpath: support discard
2010-08-12 04:14:32 +01:00
media
v4l: Remove reference to bkl ioctl in compat ioctl handling
2010-08-14 00:24:24 +02:00
memstick
memstick: fix hangs on unexpected device removal in mspro_blk
2010-08-12 08:43:31 -07:00
message
fusion: add function parameter names to kernel-doc
2010-08-14 16:21:00 -07:00
mfd
Merge branch 'for-2.6.36' into for-2.6.37
2010-08-16 18:42:58 +01:00
misc
Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2010-08-12 10:01:59 -07:00
mmc
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
2010-08-14 11:54:09 -07:00
mtd
Merge git://git.infradead.org/mtd-2.6
2010-08-15 17:32:47 -07:00
net
pcmcia: xirc2ps_cs bugfix
2010-08-13 16:55:26 -07:00
nubus
…
of
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
oprofile
oprofile: make event buffer nonseekable
2010-07-26 10:58:24 +02:00
parisc
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-08-04 15:31:02 -07:00
parport
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
pci
Merge git://git.infradead.org/iommu-2.6
2010-08-15 17:34:20 -07:00
pcmcia
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
platform
ideapad: Only allow camera state to be set to 0 or 1
2010-08-11 18:00:52 +01:00
pnp
PNPACPI: Add support for remote wakeup
2010-07-19 01:58:48 +02:00
power
Merge git://git.infradead.org/battery-2.6
2010-08-12 09:58:33 -07:00
pps
…
ps3
…
rapidio
…
regulator
regulator: Remove default DEBUG define from TPS6586x
2010-08-11 11:38:03 +01:00
rtc
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
s390
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
2010-08-13 10:54:04 -07:00
sbus
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-08-14 12:34:34 -07:00
serial
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
sfi
…
sh
sh: add a reparent function to DIV6 clocks
2010-08-04 16:12:01 +09:00
sn
…
spi
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
2010-08-14 11:54:09 -07:00
ssb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
staging
param: remove unnecessary writable charp
2010-08-11 23:04:27 +09:30
tc
…
telephony
pcmcia: do not use io_req_t when calling pcmcia_request_io()
2010-08-03 09:04:11 +02:00
thermal
…
uio
uio: Remove IRQF_DISABLED flag from uio_cif.c
2010-08-05 13:53:33 -07:00
usb
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-08-12 10:06:29 -07:00
uwb
…
vhost
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-08-04 11:47:58 -07:00
video
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-08-12 10:06:29 -07:00
virtio
virtio: fix oops on OOM
2010-07-26 08:05:31 -07:00
vlynq
…
w1
…
watchdog
watchdog: hpwdt (12/12): Make NMI decoding a compile-time option
2010-08-13 20:54:53 +00:00
xen
Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2010-08-12 09:09:41 -07:00
zorro
zorro: Fix reading of proc/bus/zorro/* in small chunks
2010-08-09 21:14:08 +02:00
Kconfig
…
Makefile
time: Kill off CONFIG_GENERIC_TIME
2010-07-27 12:40:54 +02:00