Martin Schwidefsky 612ef28a04 Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip ... Conflicts: drivers/cpufreq/cpufreq_conservative.c drivers/cpufreq/cpufreq_ondemand.c drivers/macintosh/rack-meter.c fs/proc/stat.c fs/proc/uptime.c kernel/sched/core.c		2011-12-19 19:23:15 +01:00
..
accessibility
acpi
amba
ata
atm
auxdisplay
base	PM / Driver core: leave runtime PM enabled during system shutdown	2011-12-07 22:26:56 +01:00
bcma
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2011-12-13 14:59:42 -08:00
bluetooth
cdrom
char
clk
clocksource
connector
cpufreq	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
cpuidle
crypto
dca
devfreq
dio
dma
edac
eisa
firewire
firmware	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2011-12-02 08:10:51 -08:00
gpio	gpio: fix a build failure on KS8695 GPIO	2011-12-05 15:30:33 -08:00
gpu	vmwgfx: Use kcalloc instead of kzalloc to allocate array	2011-12-07 10:44:41 +00:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-12-02 08:25:46 -08:00
hv
hwmon	hwmon: (jz4740) Staticise jz4740_hwmon_driver	2011-12-12 08:31:21 -08:00
hwspinlock
i2c	Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-12-01 11:53:54 -08:00
ide
idle
ieee802154
infiniband	Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next	2011-11-29 18:01:53 -08:00
input
iommu	intr_remapping: Fix section mismatch in ir_dev_scope_init()	2011-12-05 18:22:53 +01:00
isdn
leds
lguest
macintosh	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
mca
md	md: raid5 crash during degradation	2011-12-09 14:26:11 +11:00
media
memstick
message
mfd
misc
mmc	mmc: core: Fix deadlock when the CONFIG_MMC_UNSAFE_RESUME is not defined	2011-12-10 16:18:39 -05:00
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2011-12-09 08:08:57 -08:00
nfc
nubus
of	of/irq: Get rid of NO_IRQ usage	2011-12-07 09:06:37 -08:00
oprofile
parisc
parport
pci
pcmcia
pinctrl
platform	toshiba_acpi: Fix machines that don't support HCI_SYSTEM_EVENT	2011-12-05 13:07:28 -05:00
pnp
power	x86/mrst: Battery fixes	2011-12-05 17:06:37 +01:00
pps
ps3
ptp	ptp: Fix clock_getres() implementation	2011-12-06 11:38:32 +01:00
rapidio	rapidio/tsi721: modify PCIe capability settings	2011-12-09 07:50:29 -08:00
regulator
rtc	drivers/rtc/rtc-s3c.c: fix driver clock enable/disable balance issues	2011-12-09 07:50:28 -08:00
s390	[S390] ap: Setup timer for sending messages after reset.	2011-12-01 13:32:18 +01:00
sbus
scsi
sfi
sh
sn
spi	spi/gpio: fix section mismatch warning	2011-12-07 22:17:39 +01:00
ssb
staging	Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging	2011-12-02 13:30:25 -08:00
target	iscsi-target: Fix hex2bin warn_unused compile message	2011-12-06 06:00:59 +00:00
tc
telephony
thermal
tty
uio
usb	Merge branch 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus	2011-12-01 11:11:52 -08:00
uwb
vhost
video
virt
virtio
vlynq
w1
watchdog
xen
zorro
Kconfig
Makefile