summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2014-01-201-0/+2
|\
| * m68k: Fix build warning in mac_via.hPeter Zijlstra2014-01-161-0/+2
* | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2014-01-201-13/+1
|\ \
| * | arch: Clean up asm/barrier.h implementations using asm-generic/barrier.hPeter Zijlstra2014-01-121-13/+1
| |/
* | m68k/atari: Hide RTC_PORT() macro from rtc-cmosGeert Uytterhoeven2013-12-081-5/+5
* | m68k: Add support to export bootinfo in procfsGeert Uytterhoeven2013-12-081-0/+12
* | m68k: Add kexec supportGeert Uytterhoeven2013-12-081-0/+29
* | m68k: Add infrastructure for machine-specific random_get_entropy()Geert Uytterhoeven2013-11-261-0/+10
* | m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>Geert Uytterhoeven2013-11-267-34/+40
* | m68k/UAPI: Move VME Board ID definition to <asm/bootinfo-vme.h>Geert Uytterhoeven2013-11-262-17/+23
* | m68k/UAPI: Move Macintosh model definitions to <asm/bootinfo-mac.h>Geert Uytterhoeven2013-11-262-59/+63
* | m68k/UAPI: Move HP300 model definitions to <asm/bootinfo-hp300.h>Geert Uytterhoeven2013-11-262-18/+27
* | m68k/UAPI: Move Apollo model definitions to <asm/bootinfo-apollo.h>Geert Uytterhoeven2013-11-262-9/+14
* | m68k/UAPI: Move Amiga model/chipset definitions to <asm/bootinfo-amiga.h>Geert Uytterhoeven2013-11-262-25/+33
* | m68k/UAPI: Move generic definitions to <asm/bootinfo.h>Geert Uytterhoeven2013-11-263-91/+81
* | m68k/UAPI: Disintegrate arch/m68k/include/asm/bootinfo.hGeert Uytterhoeven2013-11-2611-213/+342
* | m68k/vme: Remove unused mvme_bdid_ptrGeert Uytterhoeven2013-11-261-2/+0
* | m68k/mac: Move struct mac_booter_data to <asm/macintosh.h>Geert Uytterhoeven2013-11-262-39/+23
* | m68k: Drop remainings and API of BOOTINFO_COMPAT_1_0Geert Uytterhoeven2013-11-261-112/+0
* | m68k: The bootinfo is located right after the kernelGeert Uytterhoeven2013-11-261-1/+1
* | zorro: ZTWO_VADDR() should return "void __iomem *"Geert Uytterhoeven2013-11-261-1/+1
|/
* Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2013-11-192-13/+0
|\
| * preempt: Make PREEMPT_ACTIVE genericThomas Gleixner2013-11-131-2/+0
| * hardirq: Make hardirq bits genericThomas Gleixner2013-11-131-11/+0
* | m68k: handle pgtable_page_ctor() failKirill A. Shutemov2013-11-153-3/+14
|/
* Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2013-11-121-0/+1
|\
| * sched, arch: Create asm/preempt.hPeter Zijlstra2013-09-251-0/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee...Linus Torvalds2013-11-113-2/+9
|\ \ | |/ |/|
| * m68k: Remove deprecated IRQF_DISABLEDMichael Opdenacker2013-09-262-2/+2
| * m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned()Geert Uytterhoeven2013-09-101-0/+7
* | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg...Linus Torvalds2013-09-093-3/+4
|\ \
| * | m68k: define 'VM_DATA_DEFAULT_FLAGS' no matter whether has 'NOMMU' or notGreg Ungerer2013-08-262-3/+3
| * | m68knommu: user generic iomap to support ioread*/iowrite*Greg Ungerer2013-08-261-0/+1
| |/
* | Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2013-09-041-1/+1
|\ \
| * | m68k: hardirq_count() only need preempt_mask.hFrederic Weisbecker2013-08-141-1/+1
* | | m68k: Ignore disabled HSYNC interrupt on Atari for irqs_disabled()Geert Uytterhoeven2013-08-231-0/+4
| |/ |/|
* | m68k: Truncate base in do_div()Andreas Schwab2013-08-141-4/+5
|/
* Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geer...Linus Torvalds2013-07-033-36/+6
|\
| * m68k/q40: Undefine insl/outsl before redefining themGeert Uytterhoeven2013-06-241-0/+2
| * m68k/uaccess: Fix asm constraints for userspace accessGeert Uytterhoeven2013-06-241-4/+4
| * m68k: Remove inline strcpy() and strcat() implementationsGeert Uytterhoeven2013-06-241-32/+0
* | consolidate io_remap_pfn_range definitionsAl Viro2013-06-292-6/+0
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ger...Linus Torvalds2013-06-081-1/+2
|\
| * m68k: only use local gpio_request_one if not using GPIOLIBGreg Ungerer2013-05-291-1/+2
* | m68k: implement futex.h to support userspace robust futexes and PI mutexesMikael Pettersson2013-05-212-1/+94
|/
* Merge tag 'for-linus-20130509' of git://git.infradead.org/~dwmw2/random-2.6Linus Torvalds2013-05-101-17/+0
|\
| * m68k: remove rpxlite stuffArtem Bityutskiy2013-04-051-17/+0
* | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg...Linus Torvalds2013-05-108-24/+23
|\ \
| * | m68knommu: fix ColdFire 5373/5329 QSPI base addressGreg Ungerer2013-04-291-1/+1
| * | m68knommu: create and use a common M53xx ColdFire class of CPUsGreg Ungerer2013-04-296-16/+16
OpenPOWER on IntegriCloud