Linus Torvalds 57bb559574 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (23 commits) ceph: fix cap flush race reentrancy libceph: subscribe to osdmap when cluster is full libceph: handle new osdmap down/state change encoding rbd: handle online resize of underlying rbd image ceph: avoid inode lookup on nfs fh reconnect ceph: use LOOKUPINO to make unconnected nfs fh more reliable rbd: use snprintf for disk->disk_name rbd: cleanup: make kfree match kmalloc rbd: warn on update_snaps failure on notify ceph: check return value for start_request in writepages ceph: remove useless check libceph: add missing breaks in addr_set_port libceph: fix TAG_WAIT case ceph: fix broken comparison in readdir loop libceph: fix osdmap timestamp assignment ceph: fix rare potential cap leak libceph: use snprintf for unknown addrs libceph: use snprintf for formatting object name ceph: use snprintf for dirstat content libceph: fix uninitialized value when no get_authorizer method is set ...		2011-05-25 11:46:31 -07:00
..
accessibility
acpi	x86: remove 32-bit versions of readq()/writeq()	2011-05-25 08:39:44 -07:00
amba
ata	Merge branch 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block	2011-05-25 09:14:07 -07:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
auxdisplay
base	mm: per-node vmstat: show proper vmstats	2011-05-25 08:39:07 -07:00
bcma	bcma: pci: trivial: correct amount of maximum retries	2011-05-12 14:10:50 -04:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2011-05-25 11:46:31 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
cdrom	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
clk
clocksource	Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2011-05-23 21:24:07 -07:00
connector
cpufreq	Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-19 17:55:12 -07:00
cpuidle
crypto	[S390] ap: skip device registration on type probe failure	2011-05-23 10:24:29 +02:00
dca
dio
dma	Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2011-05-23 21:24:07 -07:00
edac	x86: remove 32-bit versions of readq()/writeq()	2011-05-25 08:39:44 -07:00
eisa
firewire
firmware	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
gpio	drivers/gpio/ml_ioh_gpio.c needs slab.h	2011-05-25 08:39:57 -07:00
gpu	vmscan: change shrinker API by passing shrink_control struct	2011-05-25 08:39:26 -07:00
hid	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-05-23 12:33:02 -07:00
hwmon	hwmon: (coretemp) Add comments describing the handling of HT CPUs	2011-05-23 21:11:14 -07:00
hwspinlock
i2c	Merge branch 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux	2011-05-24 16:39:23 -07:00
ide	Merge branch 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block	2011-05-25 09:14:07 -07:00
idle
ieee802154
infiniband	Add appropriate <linux/prefetch.h> include for prefetch users	2011-05-22 21:41:57 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-05-24 11:58:49 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
leds	leds: provide helper to register "leds-gpio" devices	2011-05-25 08:39:51 -07:00
lguest
macintosh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
mca
md	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
media	Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux	2011-05-24 15:35:54 +09:00
memstick
message	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
mfd	mfd: Fix for the TWL4030 PM sleep/wakeup sequence	2011-05-11 11:09:58 +02:00
misc	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-05-23 12:23:20 -07:00
mmc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
mtd	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
net	Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-25 08:59:42 -07:00
nfc
nubus
of
oprofile
parisc
parport	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
pci	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2011-05-24 12:06:40 -07:00
pcmcia
platform	x86: remove 32-bit versions of readq()/writeq()	2011-05-25 08:39:44 -07:00
pnp
power
pps
ps3
ptp	ptp: Added a clock driver for the National Semiconductor PHYTER.	2011-05-23 13:10:23 -07:00
rapidio	rapidio: fix default routing initialization	2011-05-18 02:55:22 -07:00
regulator
rtc	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-19 17:45:08 -07:00
s390	[S390] get CPC image name	2011-05-23 10:24:32 +02:00
sbus
scsi	Merge branch 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block	2011-05-25 09:14:07 -07:00
sfi
sh	Merge branch 'sh/genirq-threading' into sh-latest	2011-05-23 11:36:14 +09:00
sn
spi	coldfire_qspi compile fix	2011-05-24 15:17:22 +10:00
ssb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
staging	vmscan: change shrinker API by passing shrink_control struct	2011-05-25 08:39:26 -07:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
tc
telephony
thermal
tty	drivers/tty/serial/pch_uart.c needs slab.h	2011-05-25 08:39:57 -07:00
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
uwb
vhost
video	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6	2011-05-25 08:42:37 -07:00
virtio
vlynq
w1
watchdog	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
xen	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
zorro
Kconfig	ptp: Added a brand new class driver for ptp clocks.	2011-05-23 13:01:00 -07:00
Makefile	Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-25 08:59:42 -07:00