Colin Cross 3f29a88349 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 ... Conflicts: drivers/usb/gadget/composite.c Change-Id: I1a332ec21da62aea98912df9a01cf0282ed50ee1		2010-12-21 18:38:13 -08:00
..
array.c	CRED: Fix get_task_cred() and task_state() to not resurrect dead credentials	2010-07-29 15:16:17 -07:00
base.c	Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36	2010-12-21 18:38:13 -08:00
cmdline.c
cpuinfo.c
devices.c
generic.c	remove inode_setattr	2010-08-09 16:47:37 -04:00
inode.c	bkl: Remove locked .ioctl file operation	2010-08-14 00:24:24 +02:00
internal.h
interrupts.c
Kconfig
kcore.c	kcore: add _text to KCORE_TEXT	2010-05-27 09:12:47 -07:00
kmsg.c	procfs: Use generic_file_llseek in /proc/kmsg	2010-04-09 16:35:41 +02:00
loadavg.c
Makefile	procfs: simplify conditional processing of fs/proc.o.	2010-08-11 08:59:20 -07:00
meminfo.c
mmu.c
nommu.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
page.c	proc: export uncached bit properly in /proc/kpageflags	2010-09-09 18:57:23 -07:00
proc_devtree.c	of: Drop properties with "/" in their name	2010-06-13 18:12:24 -06:00
proc_net.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
proc_sysctl.c	remove inode_setattr	2010-08-09 16:47:37 -04:00
proc_tty.c
root.c	proc: cleanup: remove unused assignments	2010-05-27 09:12:47 -07:00
softirqs.c
stat.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
task_mmu.c	/proc/pid/smaps: fix dirty pages accounting	2010-09-22 17:22:39 -07:00
task_nommu.c	nommu: add '[stack]' label to /proc/pid/maps output	2010-06-29 15:29:30 -07:00
uptime.c
version.c
vmcore.c	/proc/vmcore: fix seeking	2010-09-22 17:22:38 -07:00