summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'please-pull-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-07-242-13/+35
|\
| * debug: Do not permit CONFIG_DEBUG_STACK_USAGE=y on IA64 or PARISCTony Luck2012-07-191-1/+1
| * [IA64] Port OOM changes to ia64_do_page_faultKautuk Consul2012-06-141-12/+34
* | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-shLinus Torvalds2012-07-2437-1978/+2244
|\ \
| * \ Merge branch 'common/pinctrl' into sh-latestPaul Mundt2012-07-20661-3102/+5371
| |\ \
| | * | sh: pfc: pin config get/set support.Paul Mundt2012-07-202-51/+97
| | * | sh: pfc: Prefer DRV_NAME over KBUILD_MODNAME.Paul Mundt2012-07-201-5/+7
| | * | sh: pfc: pinctrl legacy group support.Paul Mundt2012-07-171-10/+16
| | * | sh: pfc: Ignore pinmux GPIOs with invalid enum IDs.Paul Mundt2012-07-171-0/+4
| | * | sh: pfc: Export pinctrl binding init symbol.Paul Mundt2012-07-171-0/+1
| | * | sh: pfc: Error out on pinctrl init resolution failure.Paul Mundt2012-07-171-0/+3
| | * | sh: pfc: Make pr_fmt consistent across pfc drivers.Paul Mundt2012-07-113-3/+3
| | * | sh: pfc: pinctrl legacy function support.Paul Mundt2012-07-111-33/+132
| | * | sh: pfc: Rudimentary pinctrl-backed GPIO support.Paul Mundt2012-07-106-133/+440
| | * | sh: pfc: Dumb GPIO stringification.Paul Mundt2012-07-101-1/+3
| | * | Merge branch 'common/pfc' into common/pinctrlPaul Mundt2012-07-108-757/+953
| | |\ \
| | | * | sh: pfc: Shuffle PFC support core.Paul Mundt2012-07-107-19/+21
| * | | | Merge branch 'common/pfc' into sh-latestPaul Mundt2012-06-21350-2025/+5319
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | sh: pfc: Verify pin type encoding size at build time.Paul Mundt2012-06-202-9/+19
| | * | | sh: pfc: Kill off unused pinmux bias flags.Paul Mundt2012-06-201-2/+0
| | * | | sh: pfc: Make gpio chip support optional where possible.Paul Mundt2012-06-202-1/+17
| | * | | sh: pfc: Split out gpio chip support.Paul Mundt2012-06-204-277/+447
| * | | | Merge branch 'sh/clkfwk' into sh-latestPaul Mundt2012-06-202-195/+159
| |\ \ \ \
| | * | | | sh: clkfwk: Consolidate div clk registration helper.Paul Mundt2012-05-251-107/+75
| | * | | | sh: clkfwk: Consolidate div6/div4 clk_ops definitions.Paul Mundt2012-05-251-25/+17
| | * | | | sh: clkfwk: Use shared sh_clk_div_enable/disable().Paul Mundt2012-05-252-45/+38
| | * | | | sh: clkfwk: Use shared sh_clk_div_set_rate()Paul Mundt2012-05-251-42/+28
| | * | | | sh: clkfwk: Use shared sh_clk_div_recalc().Paul Mundt2012-05-252-36/+28
| | * | | | sh: clkfwk: Introduce a div_mask for variable div types.Paul Mundt2012-05-252-5/+13
| | * | | | sh: clkfwk: Move to common clk_div_table accessors for div4/div6.Paul Mundt2012-05-252-13/+38
| * | | | | sh64: Fix up section mismatch warnings.Paul Mundt2012-06-141-1/+1
| * | | | | sh64: Attempt to make reserved insn trap handler resemble C.Paul Mundt2012-06-141-191/+195
| * | | | | sh: Consolidate die definitions for trap handlers.Paul Mundt2012-06-144-102/+75
| * | | | | sh64: Kill off old exception debugging helpers.Paul Mundt2012-06-143-261/+1
| * | | | | sh64: Use generic unaligned access control/counters.Paul Mundt2012-06-141-113/+37
| * | | | | Merge branch 'sh/genirq' into sh-latestPaul Mundt2012-06-131-10/+0
| |\ \ \ \ \
| | * | | | | sh: Kill off now unused arch_probe_nr_irqs().Paul Mundt2012-05-241-10/+0
| * | | | | | Merge branch 'sh/dynamic-irq-cleanup' into sh-latestPaul Mundt2012-06-1314-259/+260
| |\ \ \ \ \ \
| | * | | | | | sh: intc: Allocate subgroup virq backing desc directly.Paul Mundt2012-06-131-1/+3
| | * | | | | | sh: intc: Kill off deprecated dynamic IRQ API.Paul Mundt2012-05-242-66/+1
| | * | | | | | sh: se7343: Move CPLD IRQs to irqdomain and generic irq chip.Paul Mundt2012-05-244-51/+97
| | * | | | | | sh: se722: Move FPGA IRQs to irqdomain and generic irq chip.Paul Mundt2012-05-244-55/+94
| | * | | | | | sh: mach-x3proto: Migrate to linear irq domain.Paul Mundt2012-05-242-26/+32
| | * | | | | | sh: dreamcast: Migrate off of deprecated dynamic IRQ API.Paul Mundt2012-05-181-21/+11
| | * | | | | | sh: hd64461: Migrate off of deprecated dynamic IRQ API.Paul Mundt2012-05-181-24/+9
| | * | | | | | sh: mach-se: Migrate 7724SE off of deprecated dynamic IRQ API.Paul Mundt2012-05-181-23/+13
| * | | | | | | Merge branch 'sh/multi-unwinders' into sh-latestPaul Mundt2012-06-136-98/+102
| |\ \ \ \ \ \ \
| | * | | | | | | sh64: Ensure KALLSYMS is enabled for unwinder use.Paul Mundt2012-05-241-0/+1
| | * | | | | | | sh64: Convert to unwinder API.Paul Mundt2012-05-245-98/+101
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2012-07-24163-3008/+4611
|\ \ \ \ \ \ \ \