Files
linux/arch/sh/include/asm
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
..
…
…
2010-03-09 11:57:17 +09:00
2010-01-27 22:36:25 +09:00
…
…
…
…
2010-06-14 18:02:13 +09:00
…
…
…
2009-05-29 08:40:02 -07:00
…
…
2009-10-14 16:42:28 +09:00
…
2010-05-11 11:48:47 +09:00
2010-06-02 16:31:42 +09:00
…
2010-08-10 13:47:39 -07:00
2010-07-06 17:37:32 +09:00
2010-10-07 14:08:55 +01:00
2010-06-14 15:16:53 +09:00
…
2010-06-09 11:12:36 +02:00
…
2010-03-10 16:29:48 +09:00
2010-05-11 13:32:19 +09:00
…
2010-01-13 19:11:14 +09:00
…
2010-01-20 16:42:52 +09:00
2009-09-11 13:19:16 +09:00
2009-04-27 17:34:39 +09:00
2009-11-09 10:47:40 +09:00
2008-08-02 04:39:32 +09:00
2009-08-14 01:58:43 +09:00
…
2010-05-11 13:32:19 +09:00
…
2009-06-14 23:25:57 +09:00
2010-04-26 19:08:55 +09:00
2010-04-26 19:08:55 +09:00
…
…
…
…
…
2010-03-12 15:52:32 -08:00
2010-09-24 04:04:26 +09:00
2008-08-04 12:51:06 +09:00
…
…
…
…
…