2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
linux-next/arch/sh/boards
Linus Torvalds 1dfd166e93 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (110 commits)
  sh: i2c-sh7760: Replase from ctrl_* to __raw_*
  sh: clkfwk: Shuffle around to match the intc split up.
  sh: clkfwk: modify for_each_frequency end condition
  sh: fix clk_get() error handling
  sh: clkfwk: Fix fault in frequency iterator.
  sh: clkfwk: Add a helper for rate rounding by divisor ranges.
  sh: clkfwk: Abstract rate rounding helper.
  sh: clkfwk: support clock remapping.
  sh: pci: Convert to upper/lower_32_bits() helpers.
  sh: mach-sdk7786: Add support for the FPGA SRAM.
  sh: Provide a generic SRAM pool for tiny memories.
  sh: pci: Support secondary FPGA-driven PCIe clocks on SDK7786.
  sh: pci: Support slot 4 routing on SDK7786.
  sh: Fix up PMB locking.
  sh: mach-sdk7786: Add support for fpga gpios.
  sh: use pr_fmt for clock framework, too.
  sh: remove name and id from struct clk
  sh: free-without-alloc fix for sh_mobile_lcdcfb
  sh: perf: Set up perf_max_events.
  sh: perf: Support SH-X3 hardware counters.
  ...

Fix up trivial conflicts (perf_max_events got removed) in arch/sh/kernel/perf_event.c
2010-10-25 07:51:49 -07:00
..
mach-ap325rxa Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable 2010-08-06 18:13:19 +01:00
mach-cayman sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
mach-dreamcast sh: mach-dreamcast: Convert to sparseirq. 2010-02-02 18:01:55 +09:00
mach-ecovec24 sh: fix clk_get() error handling 2010-10-18 20:33:10 +09:00
mach-edosk7705 sh: mach-edosk7705: Fix up edosk7705 so it all builds again. 2008-12-22 18:44:45 +09:00
mach-highlander sh: switch boards to clkdev 2010-05-13 17:38:07 +09:00
mach-hp6xx sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
mach-kfr2r09 sh: add a parameter to LCDC driver's .display_on() callback 2010-08-04 16:12:11 +09:00
mach-landisk llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
mach-lboxre2 sh: Convert p3_ioremap() users to ioremap_prot(). 2010-01-19 13:55:41 +09:00
mach-microdev sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
mach-migor sh: make sure static declaration on mach-migor 2010-06-02 17:13:52 +09:00
mach-r2d sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
mach-rsk sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
mach-sdk7780 sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
mach-sdk7786 sh: mach-sdk7786: Add support for the FPGA SRAM. 2010-10-15 02:13:04 +09:00
mach-se sh: make sure static declaration on ms7724se 2010-06-02 17:13:57 +09:00
mach-sh03 sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
mach-sh7763rdp sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
mach-snapgear sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
mach-systemh sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
mach-x3proto sh: boards/mach-x3proto: gpio: fix error handling code 2010-10-12 00:34:42 +09:00
board-edosk7760.c sh: edosk7760: Correct size of bootloader flash partition. 2008-09-21 10:32:29 +09:00
board-espt.c sh: espt-giga board support 2009-03-17 15:18:52 +09:00
board-magicpanelr2.c sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
board-polaris.c sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
board-sh2007.c sh: SH-2007 board support. 2010-06-21 15:10:51 +09:00
board-sh7757lcr.c sh: add sh7757lcr board support 2010-07-06 17:38:32 +09:00
board-sh7785lcr.c sh: Prevent 64-bit pgprot clobbering across ioremap implementations. 2010-01-19 13:34:38 +09:00
board-shmin.c sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
board-titan.c sh: mach-titan: Kill off unused PIO port mangling. 2010-01-28 15:08:21 +09:00
board-urquell.c sh: Move platform smp ops in to their own structure. 2010-04-21 12:23:25 +09:00
Kconfig sh: mach-sdk7786: Add support for the FPGA SRAM. 2010-10-15 02:13:04 +09:00
Makefile sh: add sh7757lcr board support 2010-07-06 17:38:32 +09:00