Philipp Reisner
10fc89d01a
drbd: add major number to major.h ...
Since we have had a LANANA major number for years, and it is documented in
devices.txt, I think that this first patch can go upstream.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-06-16 19:47:48 -07:00
Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
2009-04-28 17:21:20 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2009-06-12 18:09:18 -07:00
drbd: add major number to major.h
2009-06-16 19:47:48 -07:00
V4L/DVB (11381): ivtv/cx18: remove VIDIOC_INT_S_AUDIO_ROUTING debug support.
2009-04-06 21:44:28 -03:00
pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
2009-06-15 02:31:47 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
Merge branch 'topic/pcm-jiffies-check' into for-linus
2009-06-10 07:26:41 +02:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
fb: add support of LCD display controller on pxa168/910 (base layer)
2009-06-13 00:09:09 +08:00
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
xen: export ioctl headers to userspace
2009-03-30 09:26:49 -07:00
10fc89d01a