212e3499b2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: iflush: update anomaly 05000491 workaround
Blackfin: outs[lwb]: make sure count is greater than 0
2011-03-04 17:31:43 -08:00
971a967bce
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
...
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
ARM: mach-shmobile: mackerel: modify LCDC clock divider value
ARM: mach-shmobile: ap4evb: modify LCDC clock divider value
ARM: mach-shmobile: mackerel: fixup memory initialize for zboot
ARM: mach-shmobile: ap4evb: fixup memory initialize for zboot
ARM: mach-shmobile: Add sh73a0 MIPI-CSI and CEU clocks
ARM: mach-shmobile: AG5EVM MIPI-DSI LCD reset delay fix
2011-03-04 17:31:19 -08:00
f0678f3237
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
...
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Change __nosave_XXX symbols to long
sh: Flush executable pages in copy_user_highpage
sh: Ensure ST40-300 BogoMIPS value is consistent
sh: sh7750: Fix incompatible pointer type
sh: sh7750: move machtypes.h to include/generated
2011-03-04 17:31:01 -08:00
be1229b4c5
Blackfin: iflush: update anomaly 05000491 workaround
...
Recent feedback from design says we need three NOPs in the hardware loop.
Signed-off-by: Mike Frysinger <vapier@gentoo.org >
2011-03-04 01:27:01 -05:00
bb7b11290a
Blackfin: outs[lwb]: make sure count is greater than 0
...
Some devices will use the outs* funcs with a length of zero, so make sure
we do not write any data in that case.
Reported-by: Gilbert Inho <gneny@edevice.com >
Signed-off-by: Mike Frysinger <vapier@gentoo.org >
2011-03-04 01:26:55 -05:00
2c34e939f9
ARM: mach-shmobile: mackerel: modify LCDC clock divider value
...
mackerel WVGA LCDC panel expect 33.3MHz for dot-clock,
but current dot-clock was 50.0MHz.
This patch modify clock divider value.
Signed-off-by: Makoto Ueda <makoto.ueda.ub@renesas.com >
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com >
Signed-off-by: Paul Mundt <lethal@linux-sh.org >
2011-03-04 15:01:29 +09:00
f60cb470ea
ARM: mach-shmobile: ap4evb: modify LCDC clock divider value
...
ap4evb WVGA LCDC panel expect 33.3MHz for dot-clock,
but current dot-clock was 50.0MHz.
This patch modify clock divider value.
Signed-off-by: Makoto Ueda <makoto.ueda.ub@renesas.com >
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com >
Signed-off-by: Paul Mundt <lethal@linux-sh.org >
2011-03-04 15:01:13 +09:00
f7d222ea2a
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
...
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
of/promtree: allow DT device matching by fixing 'name' brokenness (v5)
x86: OLPC: have prom_early_alloc BUG rather than return NULL
of/flattree: Drop an uninteresting message to pr_debug level
of: Add missing of_address.h to xilinx ehci driver
2011-03-02 20:01:57 -08:00
7a16d387dd
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Enable GENERIC_HARDIRQS_NO_DEPRECATED
alpha: irq: Convert affinity to use irq_data
alpha: irq: Remove pointless irq status manipulation
alpha: titan: Convert irq_chip functions
alpha: takara: Convert irq_chip functions
alpha: sable: Convert irq_chip functions
alpha: rx164: Convert irq_chip functions
alpha: noritake: Convert irq_chip functions
alpha: rawhide: Convert irq_chip functions
alpha: mikasa: Convert irq_chip functions
alpha: marvel: Convert irq_chip functions
alpha: eiger: Convert irq_chip functions
alpha: eb64p: Convert irq_chip functions
alpha: dp264: Convert irq_chip functions
alpha: cabriolet: Convert irq_chip functions
alpha: i8259, alcor, jensen wildfire: Convert irq_chip
alpha: srm: Convert irq_chip functions
alpha: Pyxis convert irq_chip functions
Fix typo in call to irq_to_desc()
2011-03-02 20:01:31 -08:00
ebff7c92ab
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
...
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] p4-clockmod: print EST-capable warning message only once
[CPUFREQ] fix BUG on cpufreq policy init failure
[CPUFREQ] Fix another notifier leak in powernow-k8.
[CPUFREQ] Missing "unregister_cpu_notifier" in powernow-k8.c
2011-03-02 19:58:31 -08:00
8a304e5dfb
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
...
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix call to flush_ptrace_hw_breakpoint()
powerpc/kexec: Restore ppc_md.machine_kexec
powerpc/mm: Make hpte_need_flush() safe for preemption
2011-03-02 19:58:14 -08:00
c7b01d3dc2
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
...
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
intel_idle: disable Atom/Lincroft HW C-state auto-demotion
intel_idle: disable NHM/WSM HW C-state auto-demotion
2011-03-02 18:08:03 -08:00
60cba5a57b
x86: OLPC: have prom_early_alloc BUG rather than return NULL
...
..similar to what sparc's prom_early_alloc does.
Signed-off-by: Andres Salomon <dilinger@queued.net >
Signed-off-by: Grant Likely <grant.likely@secretlab.ca >
2011-03-02 13:45:18 -07:00
10e53f5834
alpha: Enable GENERIC_HARDIRQS_NO_DEPRECATED
...
All interrupt chips are converted. Mark it clean.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:58:00 -05:00
0b534cf3e8
alpha: irq: Convert affinity to use irq_data
...
affinity is moving to irq_data. Fix it up.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:57:59 -05:00
eb1e17fb99
alpha: irq: Remove pointless irq status manipulation
...
The irq descriptors are initialized IRQ_DISABLED in the generic
code. No need to fiddle with them.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:57:59 -05:00
628150cae3
alpha: titan: Convert irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:57:59 -05:00
b148c61461
alpha: takara: Convert irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:57:58 -05:00
c90c10c8bf
alpha: sable: Convert irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:57:58 -05:00
2758a8af18
alpha: rx164: Convert irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:57:58 -05:00
76f4645fc2
alpha: noritake: Convert irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:57:58 -05:00
67436cef19
alpha: rawhide: Convert irq_chip functions
...
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:57:57 -05:00
a326526360
alpha: mikasa: Convert irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:57:57 -05:00
08876fe851
alpha: marvel: Convert irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:57:57 -05:00
c049766445
alpha: eiger: Convert irq_chip functions
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Matt Turner <mattst88@gmail.com >
2011-03-02 14:57:56 -05:00
Linus Torvalds
Mike Frysinger
Kuninori Morimoto
Andres Salomon
Thomas Gleixner