Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
[linux-2.6] / include / asm-um / irqflags.h
2006-06-05  Linus TorvaldsMerge /linux/kernel/git/brodo/pcmcia-fixes-2.6
2006-06-05  Jeff Dike[PATCH] uml: add asm/irqflags.h