summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_irq.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-05-22 10:40:59 +0200
committerJames Morris <jmorris@namei.org>2009-05-22 10:40:59 +0200
commit2c9e703c618106f5383226fbb1f526cb11034f8a (patch)
tree87d7548001ea82f655fede0640466fc16aabcdf7 /drivers/acpi/pci_irq.c
parentsmack: do not beyond ARRAY_SIZE of data (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff)
downloadlinux-2c9e703c618106f5383226fbb1f526cb11034f8a.tar.xz
linux-2c9e703c618106f5383226fbb1f526cb11034f8a.zip
Merge branch 'master' into next
Conflicts: fs/exec.c Removed IMA changes (the IMA checks are now performed via may_open()). Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/acpi/pci_irq.c')
0 files changed, 0 insertions, 0 deletions