summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2010-09-20Merge remote branch 'irqflags/master'Stephen Rothwell
2010-09-20Merge remote branch 'bkl-config/config'Stephen Rothwell
2010-09-20Merge remote branch 'bkl-llseek/llseek'Stephen Rothwell
2010-09-20Merge branch 'quilt/tty'Stephen Rothwell
2010-09-20Merge remote branch 'percpu/for-next'Stephen Rothwell
Conflicts: mm/percpu.c
2010-09-20Merge remote branch 'oprofile/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'lost-spurious-irq/lost-spurious-irq'Stephen Rothwell
Conflicts: drivers/ata/libata-core.c include/linux/libata.h
2010-09-20Merge remote branch 'tip/auto-latest'Stephen Rothwell
Conflicts: net/core/dev.c
2010-09-20Merge remote branch 'omap_dss2/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild
2010-09-20Merge remote branch 'catalin/for-next'Stephen Rothwell
Conflicts: arch/arm/include/asm/smp_plat.h arch/arm/kernel/Makefile
2010-09-20Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/mfd/sh_mobile_sdhi.c
2010-09-20Merge remote branch 'battery/master'Stephen Rothwell
2010-09-20Merge remote branch 'input/next'Stephen Rothwell
2010-09-20Merge remote branch 'sound-asoc/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c drivers/video/sh_mobile_hdmi.c
2010-09-20Merge remote branch 'crypto/master'Stephen Rothwell
2010-09-20Merge remote branch 'kvm/linux-next'Stephen Rothwell
2010-09-20Merge remote branch 'xtensa/master'Stephen Rothwell
Conflicts: arch/xtensa/configs/iss_defconfig
2010-09-20Merge remote branch 'genesis/master'Stephen Rothwell
2010-09-20Merge remote branch 'sh/master'Stephen Rothwell
2010-09-20Merge remote branch 's390/features'Stephen Rothwell
2010-09-20Merge remote branch 'galak/next'Stephen Rothwell
Conflicts: arch/powerpc/platforms/85xx/mpc85xx_mds.c
2010-09-20Merge remote branch 'powerpc/next'Stephen Rothwell
2010-09-20Merge remote branch 'microblaze/next'Stephen Rothwell
2010-09-20Merge remote branch 'm68knommu/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'm68k/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'tegra/for-next'Stephen Rothwell
2010-09-20Merge remote branch 's5p/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-s3c64xx/dev-spi.c arch/arm/mach-s5pv210/cpu.c
2010-09-20Merge remote branch 'samsung/next-samsung'Stephen Rothwell
Conflicts: arch/arm/mach-s3c64xx/Makefile arch/arm/mach-s3c64xx/mach-smdk6410.c arch/arm/plat-samsung/Kconfig drivers/input/touchscreen/s3c2410_ts.c
2010-09-20Merge remote branch 'omap/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'msm/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'i.MX/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'davinci/davinci-next'Stephen Rothwell
2010-09-20Merge remote branch 'arm/devel'Stephen Rothwell
2010-09-20Merge remote branch 'arm-current/master'Stephen Rothwell
2010-09-20ioctl: Use asm-generic/ioctls.h on s390 (enables termiox)Jeff Mahoney
This patch converts s390 to use asm-generic/ioctls.h instead of its own version. The differences between the arch-specific version and the generic version are as follows: - S390 defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it - The generic version adds TIOCGRS485 and TIOCGRS485, which are unused by any driver available on this architecture - The generic version adds support for termiox Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20ioctl: Use asm-generic/ioctls.h on mn10300 (enables termiox)Jeff Mahoney
This patch converts mn10300 to use asm-generic/ioctls.h instead of its own version. The differences between the arch-specific version and the generic version are as follows: - The generic version provides TIOCGRS485 and TIOCSRS485 but they are unused by any driver available for this architecture. - The generic version adds support for termiox Cc: David Howells <dhowells@redhat.com> Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com> Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20ioctl: Use asm-generic/ioctls.h on m68k (enables termiox)Jeff Mahoney
This patch converts m68k to use asm-generic/ioctls.h instead of its own version. The differences between the arch-specific version and the generic version are as follows: - m68k defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it - The generic version adds TIOCSRS485 and TIOCGRS485m which are unused by any driver available on this architecture. - The generic version adds support for termiox Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20ioctl: Use asm-generic/ioctls.h on m32r (enables termiox)Jeff Mahoney
This patch converts m32r to use asm-generic/ioctls.h instead of its own version. The differences between the arch-specific version and the generic version are as follows: - The generic version adds TIOCGRS485 and TIOCGRS485, which are unused by any driver available on this architecture. - The generic version adds support for termiox Cc: Hirokazu Takata <takata@linux-m32r.org> Cc: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20ioctl: Use asm-generic/ioctls.h on ia64 (enables termiox)Jeff Mahoney
This patch converts ia64 to use asm-generic/ioctls.h instead of its own version. The differences between the arch-specific version and the generic version are as follows: - The generic version adds TIOCSRS485 and TIOCGRS485, which are unused by any driver available on this architecture. - The generic version adds support for termiox Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20ioctl: Use asm-generic/ioctls.h on h8300 (enables termiox)Jeff Mahoney
This patch converts h8300 to use asm-generic/ioctls.h instead of its own version. The differences between the arch-specific version and the generic version are as follows: - H8300 defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it - The generic version adds TIOCSRS485 and TIOGSRS485, but are unused by any driver available on this architecture. - The generic version adds support for termiox Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20ioctl: Use asm-generic/ioctls.h on frv (enables termiox)Jeff Mahoney
This patch converts frv to use asm-generic/ioctls.h instead of its own version. The differences between the arch-specific version and the generic version are as follows: - FRV defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it - FRV defines TIOCTTYGSTRUCT, kept in arch-specific version - The generic version provides TIOCGRS485 and TIOCSRS485 but they are unused by any driver available for this architecture. - The generic version adds support for termiox Cc: David Howells <dhowells@redhat.com> Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20ioctl: Use asm-generic/ioctls.h on cris (enables termiox)Jeff Mahoney
This patch converts cris to use asm-generic/ioctls.h instead of its own version. The differences between the arch-specific version and the generic version are as follows: - CRIS defines two ioctls: TIOCSERSETRS485 and TIOCSERWRRS485, kept in arch-specific portion - CRIS defines a different value for TIOCSRS485, kept via ifndef in generic - The generic version adds support for termiox Cc: Mikael Starvik <starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20ioctl: Use asm-generic/ioctls.h on avr32 (enables termiox)Jeff Mahoney
This patch converts avr32 to use asm-generic/ioctls.h instead of its own version. The differences between the arch-specific version and the generic version are as follows: - The generic version adds support for termiox Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-20ioctl: Use asm-generic/ioctls.h on arm (enables termiox)Jeff Mahoney
This patch converts arm to use asm-generic/ioctls.h instead of its own version. The differences between the arch-specific version and the generic version are as follows: - ARM defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it - The generic version adds support for termiox Reviewed-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-19Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6: alpha: deal with multiple simultaneously pending signals alpha: fix a 14 years old bug in sigreturn tracing alpha: unb0rk sigsuspend() and rt_sigsuspend() alpha: belated ERESTART_RESTARTBLOCK race fix alpha: Shift perf event pending work earlier in timer interrupt alpha: wire up fanotify and prlimit64 syscalls alpha: kill big kernel lock alpha: fix build breakage in asm/cacheflush.h alpha: remove unnecessary cast from void* in assignment. alpha: Use static const char * const where possible
2010-09-19Merge branch 's5p-fixes-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C64XX: Add IORESOURCE_IRQ_HIGHLEVEL flag to dm9000 on mach-real6410 ARM: S3C64XX: Fix coding style errors on mach-real6410 ARM: S3C64XX: Prototype SPI devices ARM: S3C64XX: Fix dev-spi build ARM: SAMSUNG: Fix on s5p_gpio_[get,set]_drvstr ARM: SAMSUNG: Fix on drive strength value ARM: S5PV210: Add FIMC clocks ARM: S5PV210: Reduce the iodesc length of systimer ARM: S5PV210: Update I2C-1 Clock Register Property. ARM: S5P: Decrease IO Registers memory region size on FIMC ARM: S5P: Fix DMA coherent mask for FIMC
2010-09-19sh: fix an SIU device name mismatchGuennadi Liakhovetski
Recent ASoC changes unified all PCM names, fix the platform code to match. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-09-19Merge branch 'devel-stable' into develRussell King
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 11:03:15 +0000