path: root/Makefile
diff options
authorLinus Torvalds <>2013-06-02 06:24:54 +0900
committerLinus Torvalds <>2013-06-02 06:24:54 +0900
commitcc8639739250a4a5bbfb29abffdab8ff2c8ab1b6 (patch)
tree86bdb6694d6361a97bfe6b16807028c0e148dccb /Makefile
parentaa3ae6de36c86994c3446bdbc6b69ece9193732a (diff)
parent4edb38695d9a3cd62739f8595e21f36f0aabf4c2 (diff)
Merge branch 'for-3.10' of git://
Pull parisc fixes from Helge Deller: "This patcheset includes fixes for: - the PCI/LBA which brings back the stifb graphics framebuffer console - possible memory overflows in parisc kernel init code - parport support on older GSC machines - avoids that users by mistake enable PARPORT_PC_SUPERIO on parisc - MAINTAINERS file list updates for parisc." * 'for-3.10' of git:// parisc: parport0: fix this legacy no-device port driver! parport_pc: disable PARPORT_PC_SUPERIO on parisc architecture parisc/PCI: lba: fix: convert to pci_create_root_bus() for correct root bus resources (v2) parisc/PCI: Set type for LBA bus_num resource MAINTAINERS: update parisc architecture file list parisc: kernel: using strlcpy() instead of strcpy() parisc: rename "CONFIG_PA7100" to "CONFIG_PA7000" parisc: fix kernel BUG at arch/parisc/include/asm/mmzone.h:50 parisc: memory overflow, 'name' length is too short for using
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions