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
..
algos	i2c: Change to new flag variable	2010-10-24 18:16:58 +02:00
busses	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-10-25 07:51:49 -07:00
muxes	i2c/pca954x: Remove __devinit and __devexit from probe and remove functions	2010-10-24 18:16:59 +02:00
i2c-boardinfo.c
i2c-core.c	i2c: Optimize function i2c_detect()	2010-10-24 18:16:58 +02:00
i2c-core.h
i2c-dev.c	i2c: Let i2c_parent_is_i2c_adapter return the parent adapter	2010-10-24 18:16:57 +02:00
i2c-mux.c
i2c-smbus.c
Kconfig	i2c: Fix Kconfig dependencies	2010-10-24 18:16:57 +02:00
Makefile	i2c: Change to new flag variable	2010-10-24 18:16:58 +02:00