diff options
author | Linus Torvalds | 2011-07-25 21:38:42 +0200 |
---|---|---|
committer | Linus Torvalds | 2011-07-25 21:38:42 +0200 |
commit | ae4c42e4e4d76d003f8ca551fe1aef93ff9a4b21 (patch) | |
tree | 2bff2e4f4456077e7d7c589c8c28824f12dfa21c /fs/ext2/xattr.h | |
parent | Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ar... (diff) | |
parent | Merge branch 'next-samsung-cleanup' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
download | kernel-qcow2-linux-ae4c42e4e4d76d003f8ca551fe1aef93ff9a4b21.tar.gz kernel-qcow2-linux-ae4c42e4e4d76d003f8ca551fe1aef93ff9a4b21.tar.xz kernel-qcow2-linux-ae4c42e4e4d76d003f8ca551fe1aef93ff9a4b21.zip |
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (133 commits)
ARM: EXYNOS4: Change devname for FIMD clkdev
ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx
ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210
ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100
ARM: S3C24XX: Use generic s3c_set_platdata for devices
ARM: S3C64XX: Use generic s3c_set_platdata for OneNAND
ARM: SAMSUNG: Use generic s3c_set_platdata for NAND
ARM: SAMSUNG: Use generic s3c_set_platdata for USB OHCI
ARM: SAMSUNG: Use generic s3c_set_platdata for HWMON
ARM: SAMSUNG: Use generic s3c_set_platdata for FB
ARM: SAMSUNG: Use generic s3c_set_platdata for TS
ARM: S3C64XX: Add PWM backlight support on SMDK6410
ARM: S5P64X0: Add PWM backlight support on SMDK6450
ARM: S5P64X0: Add PWM backlight support on SMDK6440
ARM: S5PC100: Add PWM backlight support on SMDKC100
ARM: S5PV210: Add PWM backlight support on SMDKV210
ARM: EXYNOS4: Add PWM backlight support on SMDKC210
ARM: EXYNOS4: Add PWM backlight support on SMDKV310
ARM: SAMSUNG: Create a common infrastructure for PWM backlight support
clocksource: convert 32-bit down counting clocksource on S5PV210/S5P64X0
...
Fix up trivial conflict in arch/arm/mach-imx/mach-scb9328.c
Diffstat (limited to 'fs/ext2/xattr.h')
0 files changed, 0 insertions, 0 deletions