Ingo Molnar f541ae326f Merge branch 'linus' into perfcounters/core-v2 ... Merge reason: we have gathered quite a few conflicts, need to merge upstream Conflicts: arch/powerpc/kernel/Makefile arch/x86/ia32/ia32entry.S arch/x86/include/asm/hardirq.h arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/cpu/common.c arch/x86/kernel/irq.c arch/x86/kernel/syscall_table_32.S arch/x86/mm/iomap_32.c include/linux/sched.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-04-06 09:02:57 +02:00
..
ABI	Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-04-05 11:04:19 -07:00
accounting
acpi
aoe
arm	Merge branch 'next-s3c-pm' of git://aeryn.fluff.org.uk/bjdooks/linux into devel	2009-03-26 22:44:43 +00:00
auxdisplay
blackfin
block	block: Repeated lines in switching-sched.txt	2009-03-26 11:01:28 +01:00
blockdev
cdrom
cgroups	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
connector
console
cpu-freq
cpuidle
cris
crypto
development-process
device-mapper
DocBook	documentation: ignore byproducts from latex	2009-04-02 19:04:53 -07:00
driver-model
dvb	V4L/DVB (11138): get_dvb_firmware: add support for downloading the cx2584x firmware for pvrusb2	2009-03-30 12:43:31 -03:00
early-userspace
fault-injection
fb	fbdev: remove cyblafb driver	2009-04-01 08:59:33 -07:00
filesystems	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2009-04-05 11:06:45 -07:00
firmware_class
frv
hwmon	hwmon: Add LTC4215 driver	2009-04-01 08:59:21 -07:00
i2c	Move the pcf8591 driver to hwmon	2009-03-30 21:46:43 +02:00
i2o
ia64	trivial: Fix misspelling of firmware	2009-03-30 15:21:59 +02:00
ide
infiniband
input
ioctl	V4L/DVB (10870a): remove all references for video_decoder.h	2009-03-30 12:43:15 -03:00
isdn
ja_JP
kbuild
kdump
ko_KR
laptops	Merge branch 'thinkpad-acpi' into release	2009-04-05 01:42:09 -04:00
lguest	lguest: barrier me harder	2009-03-30 21:55:26 +10:30
m68k
make
mips
misc-devices	drivers/misc/isl29003.c: driver for the ISL29003 ambient light sensor	2009-04-01 08:59:18 -07:00
mn10300
mtd
namespaces
netlabel
networking	Neterion: Driver help file	2009-04-02 00:33:39 -07:00
parisc
PCI
pcmcia
power
powerpc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
prctl
RCU	Doc: Fix spelling in RCU/rculist_nulls.txt.	2009-04-02 01:33:51 -07:00
s390
scheduler	trivial: fix where cgroup documentation is not correctly referred to	2009-03-30 15:22:02 +02:00
scsi
serial
sh
sound	Merge branch 'topic/oxygen' into for-linus	2009-03-24 00:36:17 +01:00
sparc
spi
sysctl	documentation: fix unix_dgram_qlen description	2009-04-02 19:04:53 -07:00
telephony
thermal
timers
tracers
uml
usb	USB: usbmon: Add binary API v1	2009-03-24 16:20:36 -07:00
video4linux	V4L/DVB (11225): v4lgrab: fix compilation warnings	2009-03-30 12:43:41 -03:00
vm	Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-04-05 11:04:19 -07:00
w1
watchdog
wimax
x86	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
zh_CN
00-INDEX	trivial: fix where cgroup documentation is not correctly referred to	2009-03-30 15:22:02 +02:00
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
BUG-HUNTING
c2port.txt
cachetlb.txt
Changes
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	LANANA: Change of management and resync	2009-04-03 15:27:19 -07:00
DMA-API.txt
DMA-attributes.txt
DMA-ISA-LPC.txt
DMA-mapping.txt
dmaengine.txt
dontdiff	dontdiff: Fix asm exclude	2009-03-26 15:45:43 -07:00
dynamic-debug-howto.txt	Dynamic debug: allow simple quoting of words	2009-03-24 16:38:27 -07:00
edac.txt
eisa.txt
email-clients.txt
exception.txt
feature-removal-schedule.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2009-04-03 15:25:44 -07:00
ftrace.txt
gpio.txt	gpio: gpio_{request,free}() now required (feature removal)	2009-04-02 19:04:51 -07:00
highuid.txt
HOWTO
hw_random.txt
ics932s401
initrd.txt
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
IO-mapping.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
kernel-parameters.txt	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-04-05 11:16:25 -07:00
keys-request-key.txt
keys.txt
kobject.txt
kprobes.txt
kref.txt
ldm.txt
leds-class.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
logo.svg
logo.txt
magic-number.txt
Makefile
ManagementStyle
markers.txt
mca.txt
md.txt	Documentation/md.txt update	2009-03-31 15:18:37 +11:00
memory-barriers.txt
memory-hotplug.txt
memory.txt
mono.txt
mutex-design.txt
nmi_watchdog.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
parport-lowlevel.txt
parport.txt
perf-counters.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt
prio_tree.txt
rbtree.txt
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
slow-work.txt	Document the slow work thread pool	2009-04-03 16:42:35 +01:00
SM501.txt
Smack.txt	smack: Add a new '-CIPSO' option to the network address label configuration	2009-03-28 15:01:37 +11:00
sparse.txt
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt
SubmitChecklist
SubmittingDrivers
SubmittingPatches
svga.txt
sysfs-rules.txt
sysrq.txt	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
tracepoints.txt	tracing: Documentation / sample code fixes for tracepoints	2009-03-24 22:32:12 +01:00
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
video-output.txt
volatile-considered-harmful.txt
voyager.txt
zorro.txt