You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 1380516599 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 ... * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits) staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register. staging:iio:kfifo_buf fix double initialization of the ring device structure. staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata. staging:iio:imu fix missing register table index for some channels spectra: enable device before poking it staging: rts_pstor: Fix a miswriting staging/lirc_bt829: Return -ENODEV when no hardware is found. staging/lirc_parallel: remove pointless prototypes. staging/lirc_parallel: fix panic on rmmod staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata. Staging: zram: Fix kunmapping order Revert "gma500: Fix dependencies" gma500: Add medfield header gma500: wire up the mrst i2c bus from chip_info gma500: Fix DPU build gma500: Clean up the DPU config and make it runtime gma500: resync with Medfield progress gma500: Use the mrst helpers and power control for mode commit gma500@ Fix backlight range error gma500: More Moorestown muddle meddling means MM maybe might modeset ... Fix up fairly trivial conflicts all over, mostly due to header file cleanup conflicts, but some deleted files and some just context changes: - Documentation/feature-removal-schedule.txt - drivers/staging/bcm/headers.h - drivers/staging/brcm80211/brcmfmac/dhd_linux.c - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h - drivers/staging/brcm80211/brcmfmac/wl_iw.c - drivers/staging/et131x/et131x_netdev.c - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c - drivers/staging/rtl8192e/r8192E.h - drivers/staging/usbip/userspace/src/utils.h		14 years ago
..
boot	Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next	14 years ago
common	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	14 years ago
configs	Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
include/asm	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
kernel	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
lib	ARM: 6945/1: Add unwinding support for division functions	14 years ago
mach-at91	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	14 years ago
mach-bcmring	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	14 years ago
mach-clps711x	…
mach-cns3xxx	ARM: CNS3XXX: add UL suffix to VMALLOC_END to ensure it is properly typed	14 years ago
mach-davinci	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-dove	ARM: remove duplicate include from arch/arm/mach-dove/common.c	14 years ago
mach-ebsa110	…
mach-ep93xx	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	14 years ago
mach-exynos4	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-footbridge	Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	14 years ago
mach-gemini	Merge git://git.infradead.org/mtd-2.6	14 years ago
mach-h720x	Merge branch 'devel-stable' into for-next	14 years ago
mach-imx	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-integrator	mach-integrator: delete bits.h include file	14 years ago
mach-iop13xx	net: remove mm.h inclusion from netdevice.h	14 years ago
mach-iop32x	ARM: zImage: remove the static qualifier from global data variables	14 years ago
mach-iop33x	ARM: zImage: remove the static qualifier from global data variables	14 years ago
mach-ixp4xx	Merge branch 'devel-stable' into for-next	14 years ago
mach-ixp23xx	…
mach-ixp2000	…
mach-kirkwood	ARM: orion: Refactor the MPP code common in the orion platform	14 years ago
mach-ks8695	…
mach-l7200/include/mach	…
mach-lpc32xx	Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-mmp	mmc: sdhci-pxa: move platform data to include/linux/platform_data	14 years ago
mach-msm	Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-mv78xx0	treewide: Convert uses of struct resource to resource_size(ptr)	14 years ago
mach-mx5	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-mxs	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-netx	ARM: 6827/1: mach-netx: delete hardcoded periphid	14 years ago
mach-nomadik	gpio: move Nomadik GPIO driver to drivers/gpio	14 years ago
mach-nuc93x	ARM: NUC93X: add UL suffix to VMALLOC_END to ensure it is properly typed	14 years ago
mach-omap1	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-omap2	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	14 years ago
mach-orion5x	ARM: orion5x: fixup 5181 MPP mask check	14 years ago
mach-pnx4008	ARM: entry: remove unused irq_prio_table macro	14 years ago
mach-pxa	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	14 years ago
mach-realview	Merge branch 'devel-stable' into for-next	14 years ago
mach-rpc	ARM: zImage: remove the static qualifier from global data variables	14 years ago
mach-s3c64xx	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-s3c2400/include/mach	ARM: mach-s3c2400: delete	14 years ago
mach-s3c2410	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	14 years ago
mach-s3c2412	Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-s3c2416	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-s3c2440	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-s3c2443	ARM: S3C24XX: Add clkdev support	14 years ago
mach-s5p64x0	ARM: S5P64X0: Add PWM backlight support on SMDK6450	14 years ago
mach-s5pc100	ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100	14 years ago
mach-s5pv210	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-sa1100	Merge branch 'devel-stable' into for-next	14 years ago
mach-shark	Merge branch 'devel-stable' into for-next	14 years ago
mach-shmobile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	14 years ago
mach-spear3xx	ARM: 6931/1: SPEAr3xx: Rework KConfig to allow all boards to be compiled in	14 years ago
mach-spear6xx	ARM: 6934/1: SPEAr6xx: Rework Kconfig for single image solution	14 years ago
mach-tcc8k	clocksource: convert ARM 32-bit up counting clocksources	14 years ago
mach-tegra	Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
mach-u300	Merge branch 'master' into for-next	14 years ago
mach-ux500	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	14 years ago
mach-versatile	Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate	14 years ago
mach-vexpress	Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next	14 years ago
mach-vt8500	arm: mach-vt8500: add forgotten irq_data conversion	14 years ago
mach-w90x900	Merge branch 'devel-stable' into for-linus	14 years ago
mm	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
nwfpe	…
oprofile	…
plat-iop	ARM: 6969/1: plat-iop: fix build error	14 years ago
plat-mxc	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
plat-nomadik	net: remove mm.h inclusion from netdevice.h	14 years ago
plat-omap	Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
plat-orion	genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)	14 years ago
plat-pxa	mmc: sdhci-pxa: move platform data to include/linux/platform_data	14 years ago
plat-s3c24xx	Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
plat-s5p	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	14 years ago
plat-samsung	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	14 years ago
plat-spear	switch assorted clock drivers to debugfs_remove_recursive()	14 years ago
plat-tcc	…
plat-versatile	ARM: consolidate SMP cross call implementation	14 years ago
tools	ARM: Update mach-types	14 years ago
vfp	Merge branch 'devel-stable' into for-next	14 years ago
Kconfig	Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	14 years ago
Kconfig-nommu	…
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	14 years ago
Makefile	ARM: mach-loki: delete	14 years ago