Tejun Heo c43768cbb7 Merge branch 'master' into for-next ... Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix changes. As alpha in percpu tree uses 'weak' attribute instead of inline assembly, there's no need for __used attribute. Conflicts: arch/alpha/include/asm/percpu.h arch/mn10300/kernel/vmlinux.lds.S include/linux/percpu-defs.h		2009-07-04 07:13:18 +09:00
..
acpi	Merge branch 'bjorn-notify' into release	2009-06-24 01:22:20 -04:00
asm-generic	Merge branch 'master' into for-next	2009-07-04 07:13:18 +09:00
crypto
drm	drm: Fix shifts which were miscalculated when converting from bitfields.	2009-06-24 16:11:04 +10:00
keys
linux	Merge branch 'master' into for-next	2009-07-04 07:13:18 +09:00
math-emu
media	V4L/DVB (11901): v4l2: Create helper function for bounding and aligning images	2009-06-23 03:21:18 -03:00
mtd	Kill jffs2-user.h	2009-06-05 17:31:38 +01:00
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6	2009-06-29 19:22:31 -07:00
pcmcia
rdma
rxrpc
scsi	sd, sr: fix Driver 'sd' needs updating message	2009-06-21 12:01:27 -05:00
sound	Merge branch 'topic/pcm-jiffies-check' into for-linus	2009-06-10 07:26:41 +02:00
trace	ext4: convert instrumentation from markers to tracepoints	2009-06-17 11:48:11 -04:00
video	fbdev: s1d13xxxfb: add accelerated bitblt functions	2009-06-16 19:48:00 -07:00
xen	Merge branches 'for-linus/xen/dev-evtchn', 'for-linus/xen/xenbus', 'for-linus/xen/xenfs' and 'for-linus/xen/sys-hypervisor' into for-linus/xen/master	2009-03-30 10:00:45 -07:00
Kbuild	[SCSI] FC Pass Thru support	2009-06-12 14:20:05 -05:00