summaryrefslogtreecommitdiffstats
path: root/arch/m68k
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-11-2126-937/+390
|\
| * m68k/mac: Remove mac_irq_{en,dis}able() wrappersFinn Thain2011-11-083-23/+11
| * m68k/irq: Remove obsolete support for user vector interrupt fixupsGeert Uytterhoeven2011-11-089-20/+10
| * m68k/irq: Remove obsolete m68k irq frameworkGeert Uytterhoeven2011-11-0813-820/+4
| * m68k/q40: Convert Q40/Q60 to genirqGeert Uytterhoeven2011-11-083-2/+9
| * m68k/sun3: Convert Sun3/3x to genirqGeert Uytterhoeven2011-11-082-4/+14
| * m68k/sun3: Use the kstat_irqs_cpu() wrapperGeert Uytterhoeven2011-11-081-4/+10
| * m68k/apollo: Convert Apollo to genirqGeert Uytterhoeven2011-11-082-3/+23
| * m68k/vme: Convert VME to genirqGeert Uytterhoeven2011-11-081-3/+0
| * m68k/hp300: Convert HP9000/300 and HP9000/400 to genirqGeert Uytterhoeven2011-11-081-1/+0
| * m68k/mac: Optimize interrupts using chain handlersGeert Uytterhoeven2011-11-084-63/+298
| * m68k/mac: Convert Mac to genirqGeert Uytterhoeven2011-11-085-1/+12
| * m68k/amiga: Optimize interrupts using chain handlersGeert Uytterhoeven2011-11-081-0/+104
| * m68k/amiga: Convert Amiga to genirqGeert Uytterhoeven2011-11-082-1/+3
| * m68k/amiga: Refactor amiints.cGeert Uytterhoeven2011-11-081-51/+47
| * m68k/atari: Remove code and comments about different irq typesGeert Uytterhoeven2011-11-081-236/+0
| * m68k/atari: Convert Atari to genirqGeert Uytterhoeven2011-11-081-1/+0
| * m68k/irq: Add genirq supportGeert Uytterhoeven2011-11-085-12/+112
| * m68k/irq: Remove obsolete IRQ_FLG_* usersGeert Uytterhoeven2011-11-087-79/+19
| * m68k/irq: Rename {,__}m68k_handle_int()Geert Uytterhoeven2011-11-0812-35/+35
| * m68k/irq: Add m68k_setup_irq_controller()Geert Uytterhoeven2011-11-088-8/+17
| * m68k/irq: Extract irq_set_chip()Geert Uytterhoeven2011-11-081-3/+9
| * m68k/irq: Rename setup_irq() to m68k_setup_irq() and make it staticGeert Uytterhoeven2011-11-081-2/+2
| * m68k/irq: Switch irq_chip methods to "struct irq_data *data"Geert Uytterhoeven2011-11-089-58/+113
| * m68k/irq: Rename irq_node to irq_dataGeert Uytterhoeven2011-11-082-14/+16
| * m68k/irq: Kill irq_node_t typedef, always use struct irq_nodeGeert Uytterhoeven2011-11-082-7/+7
| * m68k/irq: Rename irq_controller to irq_chipGeert Uytterhoeven2011-11-089-102/+91
| * m68k: Revive lost DIO bus config optionGeert Uytterhoeven2011-11-081-0/+9
| * m68k: Revive lost ARAnyM config optionsGeert Uytterhoeven2011-11-081-0/+31
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-11-171-0/+3
|\ \ | |/ |/|
| * net: add wireless TX status socket optionJohannes Berg2011-11-091-0/+3
* | Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-063-0/+3
|\ \
| * | m68k: Add export.h to the m68k specific files as requiredPaul Gortmaker2011-10-313-0/+3
| |/
* | Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-blockLinus Torvalds2011-11-041-2/+1
|\ \ | |/ |/|
| * Merge branch 'v3.1-rc10' into for-3.2/coreJens Axboe2011-10-192-2/+2
| |\
| * | block: remove support for bio remapping from ->make_requestChristoph Hellwig2011-09-121-2/+1
* | | Merge branch 'for-linus' of git://github.com/gregungerer/m68knommuLinus Torvalds2011-10-2535-3208/+2596
|\ \ \
| * | | m68k: drop unused Kconfig symbolsPaul Bolle2011-10-211-23/+1
| * | | m68k: drop unused Kconfig symbolsPaul Bolle2011-10-212-70/+1
| * | | m68knommu: create common externs for _ram* varsGreg Ungerer2011-10-183-3/+3
| * | | m68knommu: remove extern declarations of memory_start/memory_end from mm/initGreg Ungerer2011-10-181-3/+0
| * | | m68knommu: use generic section names in mm/init codeGreg Ungerer2011-10-181-9/+8
| * | | m68knommu: use generic section names in setup codeGreg Ungerer2011-10-182-1/+3
| * | | m68k: merge the mmu and non-mmu traps.c filesGreg Ungerer2011-10-184-1456/+1111
| * | | m68k: move hardware vector setting from traps.c to its own fileGreg Ungerer2011-10-183-116/+146
| * | | m68k: merge mmu and non-mmu include/asm/entry.h filesGreg Ungerer2011-10-187-330/+268
| * | | m68k: merge the mmu and non-mmu kernel/MakefilesGreg Ungerer2011-10-183-31/+20
| * | | m68k: merge mmu and non-mmu arch MakefilesGreg Ungerer2011-10-185-250/+174
| * | | m68k: reorganize Kconfig options to improve mmu/non-mmu selectionsGreg Ungerer2011-10-186-916/+888
| * | | m68knommu: fix problems with SPI/GPIO on ColdFire 520xPeter Turczak2011-10-184-63/+27
OpenPOWER on IntegriCloud