Linus Torvalds
f1d2c07d33
arm-soc: board specific updates ...
These changes are all for individual board files. In the long run, those
files will largely go away, and the amount of changes appears to be
continuously decreasing, which is a good sign. This time around, changes
are focused on tegra, omap and samsung.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIVAwUAUA2dfmCrR//JCVInAQLsaw//az90mZ0Tub0UO01D0uIJORBwD9JsMTQM
W3/L3FEByskB+ZbJ6HG6XEYIzbJZxN49RbXOl0DGOuqfAlAGO61jVMaSkOKsqMCz
WoLxaMZFOB7UBCGD+dvJYriirnS3OwFbCJ0Zn1xvBnpsYC2qavhorpvIXcYHh/mK
v1zBNuDWVeedKsjYQWEAI2O1kCRuFa0P91YlmdKA3pQ9kKoA/WORHVA2i8Ou+5Mc
5Yu1JQCxfJPFA0HA612zdj8bbQbqanlKgGlm7dYJ9lLSZBnQolrVMnLhVhl5wf8d
YWlJsDdSyrbIY/HFd2xul4kWGZSg1PoKDFNwBDHoBBzdR25kXmER92PuskpwBeDo
Nv56W7Hx2q7tob1woG5kE1tZFlE1cCT/MCVoLGDwpZnFJE0pBA1Hua15mB829k2y
2vnXjRIM3j020cMC9Qa9/6aFgQu5ojCvHTuKBEwFX4zxZGGrYStINhE8jg4MXI9Y
NOaqo1MP2X84T7ONuWaiJv6MyluhdGofbzWyxVU7Af+im6N8M3Lezmw8mMfsXwiw
URHHOKnBmbkQxAUKWq+G7xr+Ti5JxLkCSUrJffJSkXPOBojKnaAegRBxexM9NhTB
Y6NPt0zKxiJqyFpW4WZ8+29GP6RbwRhoeUNyI88i3RQwa3pwHAOiExZ3q86no9rO
ONQe3uLFr3k=
=nKn1
-----END PGP SIGNATURE-----
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc board specific updates from Arnd Bergmann:
"These changes are all for individual board files. In the long run,
those files will largely go away, and the amount of changes appears to
be continuously decreasing, which is a good sign. This time around,
changes are focused on tegra, omap and samsung."
Fix conflicts in arch/arm/mach-{omap2/common-board-devices.c,tegra/Makefile.boot}
as per the 'for-linus' branch.
* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
ARM: EXYNOS: Add leds status1 and status2 on Origen board
ARM: S3C64XX: Mark most Cragganmore initdata devinitdata
ARM: EXYNOS: Add missing .reserve field to SMDKC210
ARM: EXYNOS: Add DRM device to SMDK4X12 board
ARM: S3C64XX: Clean up after SPI driver platform data updates
ARM: SAMSUNG: no need to set the value for clk_xusbxti when it is 24Mhz
ARM: EXYNOS: Add framebuffer support for SMDK4X12
ARM: EXYNOS: Add HSOTG support to SMDK4X12
ARM: S5PV210: Add audio platform device in Goni board
ARM: S5PV210: Add audio platform device in Aquila board
ARM: EXYNOS: Add audio platform device in SMDKV310 board
ARM: S3C64XX: Don't specify an irq_base for WM1192-EV1 board
ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support
ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2
ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2
ARM: OMAP3530evm: set pendown_state and debounce time for ads7846
ARM: omap3evm: enable VBUS switch for EHCI tranceiver
ARM: OMAP3EVM: Adding USB internal LDOs board file
ARM: OMAP3EVM: Add NAND flash definition
ARM: OMAP3: cm-t35: add tvp5150 decoder support
...
2012-07-23 17:34:48 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-05-25 09:31:59 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
libceph: fix messenger retry
2012-07-17 19:35:59 -07:00
[media] DVB: remove "stats" property bits from ATSC-MH API property additions
2012-05-20 10:06:08 -03:00
mfd: twl: remove pdata->irq_base/_end, no more users
2012-06-19 15:24:34 -07:00
MMC highlights for 3.6:
2012-07-22 16:36:08 -07:00
net/mlx4_core: Fix number of EQs used in ICM initialisation
2012-05-31 18:18:16 -04:00
mmc: sd: Fix sd current limit setting
2012-07-22 15:25:52 -04:00
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
netfilter: xt_HMARK: fix endianness and provide consistent hashing
2012-06-07 14:53:01 +02:00
NFC: HCI based pn544 driver
2012-05-15 17:30:30 -04:00
Merge branch 'for-3.5-take-2' of git://linux-nfs.org/~bfields/linux
2012-05-31 18:18:11 -07:00
arm-soc: board specific updates
2012-07-23 17:34:48 -07:00
lib/raid6: Add SSSE3 optimized recovery functions
2012-05-22 13:54:18 +10:00
Merge branch 'regulator-drivers' into regulator-next
2012-07-22 19:32:00 +01:00
rtc: ds1307: add trickle charger support
2012-05-29 16:22:33 -07:00
ARM: MMP: add pxa910-ssp into ssp_id_table
2012-06-11 12:25:50 +08:00
bcma/ssb: parse new attributes from sprom
2012-05-16 12:45:22 -04:00
nfsd4: move rq_flavor into svc_cred
2012-05-31 20:29:58 -04:00
USB: add NO_D3_DURING_SLEEP flag and revert 151b612847
2012-06-13 13:11:39 -07:00
aio: make kiocb->private NUll in init_sync_kiocb()
2012-07-05 01:33:59 -07:00
drivers/video/backlight/apple_bl.c: include header for exported symbol prototypes
2012-05-29 16:22:29 -07:00
atm: remove the coupling to token ring support
2012-05-15 20:14:35 -04:00
gpio/generic: initialize basic_mmio_gpio shadow variables properly
2012-05-19 12:17:35 -06:00
block: Drop dead function blk_abort_queue()
2012-06-15 08:46:23 +02:00
mm: sparse: fix usemap allocation above node descriptor section
2012-07-11 16:04:49 -07:00
bug: introduce BUILD_BUG_ON_INVALID() macro
2012-05-29 16:22:20 -07:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
clk: Provide dummy clk_unregister()
2012-05-15 12:02:39 -07:00
clockevents: Make clockevents_config() a global symbol
2012-05-25 01:44:51 +02:00
Revert "mm: compaction: handle incorrect MIGRATE_UNMOVABLE type pageblocks"
2012-06-03 20:05:57 -07:00
aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
2012-05-31 17:49:32 -07:00
ftrace: Make all inline tags also include notrace
2012-06-18 09:47:00 -04:00
cpu: introduce clear_tasks_mm_cpumask() helper
2012-05-31 17:49:29 -07:00
Merge branch 'pm-domains'
2012-07-19 00:03:17 +02:00
cred: remove task_is_dead() from __task_cred() validation
2012-05-31 17:49:28 -07:00
stop passing nameidata * to ->d_revalidate()
2012-07-14 16:34:14 +04:00
Make wait_for_device_probe() also do scsi_complete_async_scans()
2012-07-18 18:15:46 -07:00
dma-buf: minor documentation fixes.
2012-05-25 12:46:23 +05:30
drivers: add Contiguous Memory Allocator
2012-05-21 15:09:37 +02:00
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
ARM: socfpga: initial support for Altera's SOCFPGA platform
2012-07-19 10:39:00 +02:00
edac: Initialize the dimm label with the known information
2012-05-28 19:13:50 -03:00
vfs: retry last component if opening stale dentry
2012-06-01 12:12:01 -04:00
etherdevice: fix comments
2012-05-17 15:36:35 -04:00
eventfd: change int to __u64 in eventfd_signal()
2012-05-31 17:49:32 -07:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
->encode_fh() API change
2012-05-29 23:28:33 -04:00
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
switch fput to task_work_add
2012-07-22 23:57:58 +04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-05-21 20:27:36 -07:00
IEEE 1394 (FireWire) subsystem updates post v3.4:
2012-05-24 12:57:47 -07:00
switch dentry_open() to struct path, make it grab references itself
2012-07-23 00:01:29 +04:00
fsnotify: handle subfiles' perm events
2012-05-30 21:04:53 -04:00
ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()
2012-05-16 20:00:27 -04:00
tracing: Remove NR_CPUS array from trace_iterator
2012-06-28 13:52:15 -04:00
genetlink: Build a generic netlink family module alias
2012-05-29 22:33:56 -04:00
mm: page_isolation: MIGRATE_CMA isolation functions added
2012-05-21 15:09:33 +02:00
gpio: fix bits conflict for gpio flags
2012-07-05 15:04:10 +02:00
Merge branch 'upstream' into for-linus
2012-05-22 11:32:31 +02:00
timekeeping: Provide hrtimer update function
2012-07-11 23:34:39 +02:00
mm: move is_vma_temporary_stack() declaration to huge_mm.h
2012-05-29 16:22:21 -07:00
mm: add new arch_make_huge_pte() method for tile support
2012-05-25 12:48:26 -04:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
i2c: Add generic I2C multiplexer using pinctrl API
2012-06-04 16:49:43 +02:00
i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
2012-05-30 10:55:34 +02:00
MCA: delete all remaining traces of microchannel bus support.
2012-05-17 19:06:13 -04:00
if: restore token ring ARP type to header
2012-05-22 17:13:11 -04:00
ipv6: correct the ipv6 option name - Pad0 to Pad1
2012-05-17 15:49:51 -04:00
rcu: Use new RCU_POINTER_INITIALIZER for gcc-style initializations
2012-07-02 12:34:22 -07:00
Input: fix input.h kernel-doc warning
2012-06-11 23:57:22 -07:00
iommu/dmar: Reserve mmio space used by the IOMMU, if the BIOS forgets to
2012-06-08 12:15:43 +02:00
genirq: reimplement exit_irq_thread() hook via task_work_add()
2012-05-23 22:11:12 -04:00
iommu/core: pass a user-provided token to fault handlers
2012-05-22 18:08:08 +02:00
mqueue: separate mqueue default value from maximum value
2012-05-31 17:49:31 -07:00
ipx: restore token ring define to include/linux/ipx.h
2012-05-23 13:49:23 -04:00
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 12:19:36 -07:00
irqdomain: Kill off duplicate definitions.
2012-05-19 12:41:56 -06:00
jbd: Write journal superblock with WRITE_FUA after checkpointing
2012-05-15 23:34:37 +02:00
ext4/jbd2: add metadata checksumming to the list of supported features
2012-05-27 08:12:42 -04:00
jump label: Remove static_branch()
2012-07-06 10:53:49 +02:00
vsprintf: fix %ps on non symbols when using kallsyms
2012-05-29 16:22:32 -07:00
kexec: export kexec.h to user space
2012-05-31 17:49:30 -07:00
syscalls, x86: add __NR_kcmp syscall
2012-05-31 17:49:32 -07:00
kbuild: install kernel-page-flags.h
2012-05-29 16:22:21 -07:00
Remove SYSTEM_SUSPEND_DISK system state
2012-07-21 13:58:17 -07:00
kexec: export kexec.h to user space
2012-05-31 17:49:30 -07:00
key: Remove extraneous parentheses from rcu_assign_keypointer()
2012-07-02 12:34:23 -07:00
kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
2012-05-31 17:49:28 -07:00
printk: Implement some unlocked kmsg_dump functions
2012-07-21 10:34:00 -07:00
KVM: s390: add capability indicating COW support
2012-05-17 21:06:01 -03:00
KVM: Pass kvm_irqfd to functions
2012-07-02 21:10:30 -03:00
lcd: add callbacks for early fb event blank support
2012-05-29 16:22:29 -07:00
include/linux/led-lm3530.h: comment correction about the range of brightness
2012-05-29 16:22:32 -07:00
leds: add new field to led_classdev struct to save activation state
2012-05-29 16:22:31 -07:00
brlocks/lglocks: turn into functions
2012-05-29 23:28:41 -04:00
memblock: free allocated memblock_reserved_regions later
2012-07-11 16:04:50 -07:00
mm/memcg: apply add/del_page to lruvec
2012-05-29 16:22:28 -07:00
mm: do_migrate_pages(): rename arguments
2012-05-29 16:22:20 -07:00
phy/micrel: Fix ID of KSZ9021
2012-05-22 15:20:28 -04:00
mISDN: Implement MISDN_CTRL_RX_OFF for more drivers
2012-05-16 15:24:36 -04:00
mISDN: Allow to set a minimum length for transparent data
2012-05-16 15:23:46 -04:00
x86/mce: Fix siginfo_t->si_addr value for non-recoverable memory faults
2012-07-11 10:20:47 -07:00
mm/memcg: apply add/del_page to lruvec
2012-05-29 16:22:28 -07:00
mm: fix slab->page _count corruption when using slub
2012-06-20 14:39:35 -07:00
bug: completely remove code generated by disabled VM_BUG_ON()
2012-05-29 16:22:20 -07:00
memory hotplug: fix invalid memory access caused by stale kswapd pointer
2012-07-11 16:04:41 -07:00
module_param: stop double-calling parameters.
2012-06-08 14:58:13 +09:30
fat: introduce special inode for managing the FSINFO block
2012-05-31 17:49:27 -07:00
video: mxsfb: move mxsfb.h into include/linux
2012-07-03 13:22:37 +08:00
fs: add nd_jump_link
2012-07-14 16:35:40 +04:00
net: add MODULE_ALIAS_NET_PF_PROTO_NAME
2012-05-29 22:33:55 -04:00
netdevice: Update netif_dbg for CONFIG_DYNAMIC_DEBUG
2012-05-30 16:34:27 -04:00
NFSv4.1: Add DESTROY_CLIENTID
2012-05-26 14:17:30 -04:00
NFSv4.1 add nfs_inode book keeping for mdsthreshold
2012-05-24 16:15:48 -04:00
NFSv4.1: Fix umount when filelayout DS is also the MDS
2012-06-18 08:45:16 -04:00
nfs: clean up ->create in nfs_rpc_ops
2012-07-14 16:33:08 +04:00
nl80211: prevent additions to old station flags API
2012-05-16 13:08:15 -04:00
mac802154: monitor device support
2012-05-16 15:17:08 -04:00
gpio: Adjust of_xlate API to support multiple GPIO chips
2012-05-18 16:48:36 -06:00
OF: PCI: const usage needed by MIPS
2012-05-21 14:31:48 +01:00
mm, oom: normalize oom scores to oom_score_adj scale only for userspace
2012-05-29 16:22:24 -07:00
mm: page_isolation: MIGRATE_CMA isolation functions added
2012-05-21 15:09:33 +02:00
pagemap.h: fix warning about possibly used before init var
2012-05-29 16:22:18 -07:00
Viresh has moved
2012-06-20 14:39:36 -07:00
PCI: EHCI: fix crash during suspend on ASUS computers
2012-07-10 09:52:05 -07:00
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 16:07:45 -07:00
perf: Introduce perf_pmu_migrate_context()
2012-06-18 12:13:21 +02:00
netdev/phy: Make get_phy_id() static and quit EXPORTing it.
2012-05-16 00:59:12 -04:00
userns: Convert proc to use kuid/kgid where appropriate
2012-05-15 14:59:28 -07:00
PM / Domains: Add device domain data reference counter
2012-07-05 22:12:32 +02:00
PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
2012-07-19 00:02:30 +02:00
security: Minor improvements to no_new_privs documentation
2012-07-08 00:25:48 +10:00
userns: Convert proc to use kuid/kgid where appropriate
2012-05-15 14:59:28 -07:00
pstore/ram_core: Factor persistent_ram_zap() out of post_init()
2012-06-13 16:52:40 -07:00
ASoC: fix pxa-ssp compiling issue under mach-mmp
2012-06-11 12:26:15 +08:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
radix-tree: fix contiguous iterator
2012-06-05 10:46:40 -07:00
lib: Change mail address of Oskar Schirmer
2012-05-17 15:18:37 +02:00
rcu: Fix broken strings in RCU's source code.
2012-07-06 06:01:49 -07:00
Revert "rcu: Move PREEMPT_RCU preemption to switch_to() invocation"
2012-07-02 11:39:19 -07:00
rcu: Precompute RCU_FAST_NO_HZ timer offsets
2012-06-06 20:43:28 -07:00
Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next
2012-07-22 19:26:07 +01:00
rescounter: remove __must_check from res_counter_charge_nofail()
2012-05-29 16:22:27 -07:00
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
rapidio: add DMA engine support for RIO data transfers
2012-05-31 17:49:31 -07:00
mm: move is_vma_temporary_stack() declaration to huge_mm.h
2012-05-29 16:22:21 -07:00
rpmsg: make sure inflight messages don't invoke just-removed callbacks
2012-07-04 11:51:59 +03:00
rtc: add ioctl to get/clear battery low voltage status
2012-05-29 16:22:33 -07:00
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-07-23 12:27:27 -07:00
take security_mmap_file() outside of ->mmap_sem
2012-06-01 10:37:01 -04:00
serial: delete the MCA specific 8250 support.
2012-05-17 19:02:14 -04:00
Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-05-23 17:12:06 -07:00
sh: intc: Kill off special reservation interface.
2012-05-22 19:07:55 +09:00
userns: Convert tmpfs to use kuid and kgid where appropriate
2012-05-15 14:59:29 -07:00
new helper: signal_delivered()
2012-06-01 12:58:52 -04:00
net: remove skb_orphan_try()
2012-06-15 15:30:15 -07:00
introduce SIZE_MAX
2012-05-31 17:49:26 -07:00
smp: Remove num_booting_cpus()
2012-06-05 17:32:30 +02:00
splice: fix racy pipe->buffers uses
2012-06-13 21:16:42 +02:00
userns: Convert stat to return values mapped from kuids and kgids
2012-05-15 14:08:35 -07:00
PM / Sleep: Separate printing suspend times from initcall_debug
2012-07-01 13:31:23 +02:00
Frontswap provides a "transcendent memory" interface for swap pages.
2012-06-04 12:28:45 -07:00
swap: fix shmem swapping when more than 8 areas
2012-06-15 21:48:14 -07:00
syscalls, x86: add __NR_kcmp syscall
2012-05-31 17:49:32 -07:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
net: Make linux/tcp.h C++ friendly (trivial)
2012-06-09 21:27:18 -07:00
set_restore_sigmask() is never called without SIGPENDING (and never should be)
2012-06-01 12:58:50 -04:00
nohz: Rename ts->idle_tick to ts->last_tick
2012-06-11 20:07:17 +02:00
clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
2012-07-10 15:47:46 +02:00
time: remove obsolete declaration
2012-05-21 16:16:58 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-22 18:27:32 -07:00
trim task_work: get rid of hlist
2012-07-22 23:57:55 +04:00
tracepoint: Use static_key_false(), since static_branch() is deprecated
2012-07-06 10:53:49 +02:00
tty: Revert the tty locking series, it needs more work
2012-06-02 15:21:43 -07:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
USB: Fix core compile with CONFIG_USB_SUSPEND=n
2012-05-21 09:00:03 -07:00
[media] v4l2-dv-timings.h: definitions for CEA-861 and VESA DMT timings
2012-05-20 08:27:44 -03:00
vga_switcheroo: Add include guard
2012-06-21 09:32:16 +01:00
[media] Fix regression in ioctl numbering
2012-06-11 15:47:21 -03:00
virtio: fix typo in comment
2012-05-22 12:16:16 +09:30
watchdog: Add support for dynamically allocated watchdog_device structs
2012-05-30 07:55:31 +02:00
