summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee...Linus Torvalds2012-01-0734-634/+582
|\
| * m68k/mac: Make CONFIG_HEARTBEAT unavailable on MacGeert Uytterhoeven2012-01-041-2/+2
| * m68k/serial: Remove references to obsolete serial config optionsGeert Uytterhoeven2011-12-286-49/+4
| * m68k/net: Remove obsolete IRQ_FLG_* usersGeert Uytterhoeven2011-12-131-4/+3
| * m68k: Don't comment out syscalls used by glibcAndreas Schwab2011-12-101-5/+5
| * m68k/atari: Move declaration of atari_SCC_reset_done to header fileGeert Uytterhoeven2011-12-103-3/+2
| * m68k/serial: Remove references to obsolete CONFIG_SERIAL167Geert Uytterhoeven2011-12-103-3/+1
| * m68k/hp300: Export hp300_ledstateGeert Uytterhoeven2011-12-102-5/+6
| * m68k: Initconst section fixesAndi Kleen2011-12-101-1/+1
| * m68k/mac: cleanup macro caseFinn Thain2011-12-103-35/+31
| * mac_scsi: fix mac_scsi on some powerbooksFinn Thain2011-12-101-14/+20
| * m68k/mac: fix powerbook 150 adb_typeFinn Thain2011-12-101-1/+1
| * m68k/mac: fix baboon irq disable and shutdownFinn Thain2011-12-101-14/+8
| * m68k/mac: oss irq fixesFinn Thain2011-12-106-109/+76
| * m68k/mac: fix nubus slot irq disable and shutdownFinn Thain2011-12-103-42/+110
| * m68k/mac: enable via_alt_mapping on performa 580Finn Thain2011-12-103-33/+24
| * m68k/mac: cleanup forward declarationsFinn Thain2011-12-1011-71/+27
| * m68k/mac: cleanup mac_irq_pendingFinn Thain2011-12-108-101/+11
| * m68k/mac: cleanup mac_clear_irqFinn Thain2011-12-105-95/+0
| * m68k/mac: early consoleFinn Thain2011-12-103-59/+89
| * m68k/mvme16x: Add support for EARLY_PRINTKKars de Jong2011-12-102-0/+171
| * m68k/serial: SERIAL_PORT_DFNS only if CONFIG_ISAKars de Jong2011-12-101-0/+2
* | Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/g...Linus Torvalds2012-01-07910-10072/+7313
|\ \
| * \ Merge branch 'restart' into for-linusRussell King2012-01-05592-5513/+3087
| |\ \
| | * | ARM: 7198/1: arm/imx6: add restart support for imx6qShawn Guo2012-01-054-3/+58
| | * | ARM: restart: remove the now empty arch_reset()Russell King2012-01-0556-245/+2
| | * | ARM: restart: remove comments about adding code to arch_reset()Russell King2012-01-054-7/+0
| | * | ARM: restart: lpc32xx & u300: remove unnecessary printkRussell King2012-01-052-3/+0
| | * | ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hookRussell King2012-01-052-27/+0
| | * | ARM: restart: w90x900: use new restart hookRussell King2012-01-056-17/+20
| | * | ARM: restart: Versatile Express: use new restart hookRussell King2012-01-051-1/+1
| | * | ARM: restart: versatile: use new restart hookRussell King2012-01-056-12/+17
| | * | ARM: restart: u300: use new restart hookRussell King2012-01-054-23/+24
| | * | ARM: restart: tegra: use new restart hookRussell King2012-01-057-5/+10
| | * | ARM: restart: spear: use new restart hookRussell King2012-01-059-12/+36
| | * | ARM: restart: shark: use new restart hookRussell King2012-01-052-3/+5
| | * | ARM: restart: sa1100: use new restart hookRussell King2012-01-0516-9/+25
| | * | ARM: 7252/1: restart: S5PV210: use new restart hookRussell King2012-01-057-5/+8
| | * | ARM: 7251/1: restart: S5PC100: use new restart hookKukjin Kim2012-01-053-0/+12
| | * | ARM: 7250/1: restart: S5P64X0: use new restart hookKukjin Kim2012-01-054-0/+13
| | * | ARM: 7266/1: restart: S3C64XX: use new restart hookKukjin Kim2012-01-0514-7/+23
| | * | ARM: 7265/1: restart: S3C24XX: use new restart hookKukjin Kim2012-01-0523-17/+113
| | * | ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms toHeiko Stuebner2012-01-0514-42/+27
| | * | ARM: restart: riscpc: use new restart hookRussell King2012-01-052-10/+12
| | * | ARM: restart: realview: use new restart hookRussell King2012-01-057-24/+15
| | * | ARM: restart: pxa: use new restart hookRussell King2012-01-0552-28/+95
| | * | ARM: restart: prima2: use new restart hookRussell King2012-01-054-8/+9
| | * | ARM: restart: pnx4008: use new restart hookRussell King2012-01-052-5/+6
| | * | ARM: restart: orion5x: use new restart hookRussell King2012-01-0524-15/+41
| | * | ARM: restart: omap: use new restart hookRussell King2012-01-0547-13/+59