James Morris d2e7ad1922 Merge branch 'master' into next ... Conflicts: security/smack/smack_lsm.c Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au> Ok'd by Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: James Morris <jmorris@namei.org>		2011-01-10 09:46:24 +11:00
..
ABI	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
accounting	taskstats: pad taskstats netlink response for aligment issues on ia64	2010-12-22 19:43:34 -08:00
acpi
aoe
arm	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2011-01-06 19:13:58 -08:00
auxdisplay
blackfin
block	Documentation: remove anticipatory scheduler info	2010-11-11 12:09:59 +01:00
blockdev
cdrom
cgroups	cgroup: add clone_children control file	2010-10-27 18:03:09 -07:00
connector
console
cpu-freq
cpuidle
cris
crypto
development-process	Documentation/development-process: more staging info	2010-11-18 15:00:47 -08:00
device-mapper
DocBook	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
driver-model	driver core: prune docs about device_interface	2010-11-10 16:57:11 -08:00
dvb	[media] Documentation/lmedm04: Fix firmware extract information	2010-12-29 08:16:30 -02:00
early-userspace
fault-injection
fb	Merge branch 'fbdev/udlfb'	2011-01-06 18:10:09 +09:00
filesystems	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
firmware_class
frv
hwmon	Documentation: change email address for Hans Koch	2010-11-18 15:00:46 -08:00
i2c	i2c-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers	2010-10-31 21:07:00 +01:00
i2o
ia64
ide
infiniband
input	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next	2010-12-27 17:33:20 -08:00
ioctl	[media] bt819: the ioctls in the header are internal to the kernel	2010-12-29 08:17:19 -02:00
isdn
ja_JP
kbuild	Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:18:59 -07:00
kdump
ko_KR
kvm	KVM: Document that KVM_GET_SUPPORTED_CPUID may return emulated values	2010-10-24 10:52:48 +02:00
laptops
leds	Documentation: led drivers lp5521 and lp5523	2010-11-12 07:55:32 -08:00
lguest	Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier	2010-10-19 09:13:04 +02:00
m68k
make
mips
misc-devices	Documentation: short descriptions for bh1770glc and apds990x drivers	2010-10-26 16:52:14 -07:00
mmc
mn10300
mtd
namespaces
netlabel
networking	Documentation/networking: Update Intel Wired LAN docs	2010-12-24 21:26:47 -08:00
parisc
PCI
pcmcia
power	PM / Runtime: Fix pm_runtime_suspended()	2010-12-16 17:12:25 +01:00
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-10-22 20:30:48 -07:00
pps
prctl
RCU	rcu: update documentation/comments for Lai's adoption patch	2010-11-29 22:01:59 -08:00
s390
scheduler
scsi	[SCSI] megaraid_sas: Documentation update	2010-12-22 23:26:53 -06:00
serial	RS485 documentation: add 16C950 UART description	2010-11-30 17:26:04 -08:00
sh	sh: clkfwk: Kill off unused clk_set_rate_ex().	2010-11-15 18:25:12 +09:00
sound	Merge branch 'topic/hda' into for-linus	2010-10-25 10:40:05 +02:00
sparc
spi	arm/pxa2xx: reorgazine SSP and SPI header files	2010-12-01 12:18:33 +01:00
sysctl	syslog: check cap_syslog when dmesg_restrict	2010-12-09 09:48:48 +11:00
telephony
thermal
timers	Documentation/timers/hpet_example.c: add supporting info for hpet_example	2010-10-26 16:52:11 -07:00
trace	tools, perf: Documentation for the power events API	2011-01-05 21:25:29 +01:00
uml
usb	USB: use the runtime-PM autosuspend implementation	2010-11-16 14:03:41 -08:00
video4linux	[media] cardlist: Update lists for em28xx and saa7134	2010-12-29 08:17:17 -02:00
vm	mm: highmem documentation	2010-10-26 16:52:08 -07:00
w1
watchdog
wimax
x86	x86: Add CE4100 platform support	2010-11-12 00:45:41 +01:00
zh_CN
.gitignore
00-INDEX
apparmor.txt
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt
cachetlb.txt
Changes
circular-buffers.txt
coccinelle.txt	Coccinelle: Fix documentation	2010-10-28 00:32:23 +02:00
CodingStyle
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
credentials.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-10-28 09:35:11 -07:00
DMA-API-HOWTO.txt
DMA-API.txt
DMA-attributes.txt
DMA-ISA-LPC.txt
dmaengine.txt
dontdiff	Documentation/dontdiff: add further autogenerated files to ignore list	2011-01-06 09:59:37 -08:00
dynamic-debug-howto.txt	Dynamic Debug: Introduce ddebug_query= boot parameter	2010-10-22 10:16:42 -07:00
edac.txt	EDAC: Fix typos in Documentation/edac.txt	2010-11-25 17:32:47 +01:00
eisa.txt
email-clients.txt
feature-removal-schedule.txt	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt	Documentation/gpio.txt: explain poll/select usage	2010-11-18 15:00:46 -08:00
highuid.txt
HOWTO
hw_random.txt
init.txt
initrd.txt
Intel-IOMMU.txt
intel_txt.txt
io-mapping.txt
io_ordering.txt
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt	Documentation: update kernel-docs.txt	2011-01-06 09:59:38 -08:00
kernel-parameters.txt	Merge branch 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-06 11:08:14 -08:00
keys-request-key.txt
keys-trusted-encrypted.txt	keys: add new trusted key-type	2010-11-29 08:55:25 +11:00
keys.txt
kmemcheck.txt
kmemleak.txt
kobject.txt
kprobes.txt	kprobes: Update document about irq disabled state in kprobe handler	2010-10-14 08:55:27 +02:00
kref.txt
ldm.txt
leds-class.txt	led-class: always implement blinking	2010-11-12 07:55:32 -08:00
leds-lp3944.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
logo.gif
logo.txt
magic-number.txt
Makefile	[media] Remove the old V4L1 v4lgrab.c file	2010-12-29 08:17:12 -02:00
ManagementStyle
mca.txt
md.txt
memory-barriers.txt
memory-hotplug.txt
memory.txt
mono.txt
mutex-design.txt
nmi_watchdog.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
padata.txt
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt
prio_tree.txt
rbtree.txt	Documentation: remove anticipatory scheduler info	2010-11-11 12:09:59 +01:00
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt
SAK.txt
SecurityBugs
SELinux.txt
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
Smack.txt
sparse.txt
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt
SubmitChecklist
SubmittingDrivers
SubmittingPatches
svga.txt
sysfs-rules.txt
sysrq.txt	documentation: update sysrq.txt magic sysrq keys	2010-10-26 17:32:41 -07:00
tomoyo.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
vgaarbiter.txt
video-output.txt
volatile-considered-harmful.txt
workqueue.txt	workqueue: add and use WQ_MEM_RECLAIM flag	2010-10-11 15:20:26 +02:00
zorro.txt