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
Showing
arch/sh/boards/board-sh2007.c
0 → 100644
arch/sh/boards/board-sh7757lcr.c
0 → 100644
arch/sh/configs/sh2007_defconfig
0 → 100644
arch/sh/include/asm/ptrace_32.h
0 → 100644
arch/sh/include/asm/ptrace_64.h
0 → 100644
arch/sh/include/asm/sram.h
0 → 100644
此差异已折叠。
此差异已折叠。
arch/sh/kernel/kdebugfs.c
0 → 100644
此差异已折叠。
arch/sh/kernel/ptrace.c
0 → 100644
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
arch/sh/mm/sram.c
0 → 100644
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
drivers/sh/clk/Makefile
0 → 100644
此差异已折叠。
drivers/sh/intc.c
已删除
100644 → 0
此差异已折叠。
drivers/sh/intc/Kconfig
0 → 100644
此差异已折叠。
drivers/sh/intc/Makefile
0 → 100644
此差异已折叠。
drivers/sh/intc/access.c
0 → 100644
此差异已折叠。
drivers/sh/intc/balancing.c
0 → 100644
此差异已折叠。
drivers/sh/intc/chip.c
0 → 100644
此差异已折叠。
drivers/sh/intc/core.c
0 → 100644
此差异已折叠。
drivers/sh/intc/dynamic.c
0 → 100644
此差异已折叠。
drivers/sh/intc/handle.c
0 → 100644
此差异已折叠。
drivers/sh/intc/internals.h
0 → 100644
此差异已折叠。
drivers/sh/intc/userimask.c
0 → 100644
此差异已折叠。
drivers/sh/intc/virq-debugfs.c
0 → 100644
此差异已折叠。
drivers/sh/intc/virq.c
0 → 100644
此差异已折叠。
此差异已折叠。
想要评论请 注册 或 登录