diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 01:47:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 01:47:15 +0200 |
| commit | 1a9b4993b70fb1884716902774dc9025b457760d (patch) | |
| tree | 83a3fa7011878ab4b7bef6857d4b481038a1e67e /fs/ceph/super.h | |
| parent | Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | MIPS: Loongson 2: Sort out clock managment. (diff) | |
| download | linux-1a9b4993b70fb1884716902774dc9025b457760d.tar.xz linux-1a9b4993b70fb1884716902774dc9025b457760d.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
"The lion share of this pull request are fixes for clk-related breakage
caused by other changes during this merge window. For some platforms
the fix was as simple as selecting HAVE_CLK, for others like the
Loongson 2 significant restructuring was required.
The remainder are changes required to get the Lantiq code to work
again."
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Loongson 2: Sort out clock managment.
MIPS: Loongson 1: more clk support and add select HAVE_CLK
MIPS: txx9: Fix redefinition of clk_* by adding select HAVE_CLK
MIPS: BCM63xx: Fix redefinition of clk_* by adding select HAVE_CLK
MIPS: AR7: Fix redefinition of clk_* by adding select HAVE_CLK
MIPS: Lantiq: Platform specific CLK fixup
MIPS: Lantiq: Add device_tree_init function
MIPS: Lantiq: Fix interface clock and PCI control register offset
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions