aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-cd.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 17:57:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 17:57:39 -0700
commitdb6f204019380c788f1de06ee937bdbccd60e5c0 (patch)
treef8ca32ab6932a21797dbc5aa77688ea017959da0 /drivers/ide/ide-cd.h
parentMerge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff)
parentlguest: barrier me harder (diff)
downloadlinux-dev-db6f204019380c788f1de06ee937bdbccd60e5c0.tar.xz
linux-dev-db6f204019380c788f1de06ee937bdbccd60e5c0.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio: lguest: barrier me harder lguest: use bool instead of int lguest: use KVM hypercalls lguest: wire up pte_update/pte_update_defer lguest: fix spurious BUG_ON() on invalid guest stack. virtio: more neatening of virtio_ring macros. virtio: fix BAD_RING, START_US and END_USE macros
Diffstat (limited to 'drivers/ide/ide-cd.h')
0 files changed, 0 insertions, 0 deletions