黄涛 7fe47454f2 Merge tag 'lsk-android-14.04' into develop-3.10 ...

lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h

2014-04-24 19:04:10 +08:00

..

array.c

kthread: Prevent unpark race which puts threads on the wrong cpu

2013-04-12 14:18:43 +02:00

base.c

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2014-03-28 11:07:37 +08:00

cmdline.c

proc: switch /proc/cmdline to seq_file

2008-10-23 14:29:04 +04:00

consoles.c

console: rename acquire/release_console_sem() to console_lock/unlock()

2011-01-26 10:50:06 +10:00

cpuinfo.c

proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c

2008-10-23 15:05:11 +04:00

devices.c

proc: use seq_puts()/seq_putc() where possible

2011-01-13 08:03:16 -08:00

fd.c

procfs: add ability to plug in auxiliary fdinfo providers

2012-12-17 17:15:27 -08:00

fd.h

proc: Move proc_fd() to fs/proc/fd.h

2013-05-01 17:29:39 -04:00

generic.c

rk: proc: fix slub warning when call setup_irq

2014-02-20 20:07:14 +08:00

inode.c

proc: Split the namespace stuff out into linux/proc_ns.h

2013-05-01 17:29:39 -04:00

internal.h

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-05-01 17:51:54 -07:00

interrupts.c

proc: move /proc/interrupts boilerplate code to fs/proc/interrupts.c

2008-10-23 15:15:46 +04:00

Kconfig

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

kcore.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-05-01 17:51:54 -07:00

kmsg.c

kmsg: honor dmesg_restrict sysctl on /dev/kmsg

2013-06-12 16:29:44 -07:00

loadavg.c

sched, timers: cleanup avenrun users

2009-05-15 15:32:45 +02:00

Makefile

mm, vmalloc: move get_vmalloc_info() to vmalloc.c

2013-04-29 15:54:33 -07:00

meminfo.c

mm, vmalloc: move get_vmalloc_info() to vmalloc.c

2013-04-29 15:54:33 -07:00

namespaces.c

proc: Split the namespace stuff out into linux/proc_ns.h

2013-05-01 17:29:39 -04:00

nommu.c

new helper: file_inode(file)

2013-02-22 23:31:31 -05:00

page.c

mm: close PageTail race

2014-04-03 12:01:05 -07:00

proc_devtree.c

proc_devtree: Replace include linux/module.h with linux/export.h

2013-05-04 15:31:01 -04:00

proc_net.c

proc: Move PDE_NET() to fs/proc/proc_net.c

2013-05-01 17:29:40 -04:00

proc_sysctl.c

fs/proc: clean up printks

2013-02-27 19:10:11 -08:00

proc_tty.c

proc: use seq_puts()/seq_putc() where possible

2011-01-13 08:03:16 -08:00

root.c

proc: Restrict mounting the proc filesystem

2013-09-26 17:18:28 -07:00

self.c

Include missing linux/slab.h inclusions

2013-04-29 15:42:01 -04:00

softirqs.c

proc: use seq_puts()/seq_putc() where possible

2011-01-13 08:03:16 -08:00

stat.c

stat: Use size_t for sizes instead of unsigned

2013-02-01 12:32:08 +02:00

task_mmu.c

Merge remote-tracking branch 'lsk/v3.10/topic/android-fixes' into linux-linaro-lsk-android

2013-11-14 15:43:52 +00:00

task_nommu.c

new helper: file_inode(file)

2013-02-22 23:31:31 -05:00

uptime.c

Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip

2011-12-19 19:23:15 +01:00

version.c

proc: switch /proc/version to seq_file

2008-10-23 14:19:58 +04:00

vmcore.c

proc: Supply a function to remove a proc entry by PDE

2013-05-01 17:29:46 -04:00