aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-06-0436-204/+642
|\
| * sh: Make intc messages consistent via pr_fmt.Paul Mundt2010-06-021-5/+7
| * sh: make sure static declaration on ms7724seKuninori Morimoto2010-06-021-4/+4
| * sh: make sure static declaration on mach-migorKuninori Morimoto2010-06-021-1/+1
| * sh: make sure static declaration on mach-ecovec24Kuninori Morimoto2010-06-021-8/+8
| * sh: make sure static declaration on mach-ap325rxaKuninori Morimoto2010-06-021-1/+1
| * clocksource: sh_cmt: compute mult and shift before registrationPaul Mundt2010-06-021-9/+13
| * clocksource: sh_tmu: compute mult and shift before registrationAurelien Jarno2010-06-021-9/+11
| * Merge branch 'sh/iomap'Paul Mundt2010-06-0215-75/+99
| |\
| | * sh: PIO disabling for x3proto and urquell.Paul Mundt2010-06-021-0/+2
| | * sh: mach-sdk7786: conditionally disable PIO support.Paul Mundt2010-06-021-0/+1
| | * sh: support for platforms without PIO.Paul Mundt2010-06-028-34/+54
| | * usb: r8a66597-hcd pio to mmio accessor conversion.Paul Mundt2010-06-022-15/+15
| | * usb: gadget: r8a66597-udc pio to mmio accessor conversion.Paul Mundt2010-06-022-14/+14
| | * usb: gadget: m66592-udc pio to mmio accessor conversion.Paul Mundt2010-06-021-11/+11
| | * input: serio: disable i8042 for non-cayman sh platforms.Paul Mundt2010-05-251-1/+2
| * | sh: add romImage MMCIF boot for sh7724 and Ecovec V2Magnus Damm2010-05-319-4/+171
| * | sh: add boot code to MMCIF driver headerMagnus Damm2010-05-311-0/+129
| * | sh: prepare MMCIF driver header fileMagnus Damm2010-05-312-75/+82
| * | sh: allow romImage data between head.S and the zero pageMagnus Damm2010-05-312-3/+10
| * | sh: Add support MMCIF for ecovecYusuke Goda2010-05-311-2/+84
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2010-05-311526-28175/+112473
| |\ \
| * | | sh: remove duplicated #includeHuang Weiyi2010-05-261-1/+0
| | |/ | |/|
| * | sh: handle early calls to return_address() when using dwarf unwinder.Paul Mundt2010-05-252-2/+19
| * | fbdev: fix erroneous index in drivers/video/sh_mobile_lcdcfb.cGuennadi Liakhovetski2010-05-251-3/+3
| * | serial: sh-sci: fix up serial DMA build.Paul Mundt2010-05-251-3/+1
* | | Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mc...Linus Torvalds2010-06-0413-44/+2598
|\ \ \
| * | | i7core_edac: Better describe the supported devicesMauro Carvalho Chehab2010-05-181-2/+7
| * | | Add support for Westmere to i7core_edac driverVernon Mauery2010-05-182-37/+96
| * | | i7core_edac: don't free on successTony Luck2010-05-181-1/+2
| * | | i7core_edac: Add support for X5670Mauro Carvalho Chehab2010-05-182-1/+7
| * | | Always call i7core_[ur]dimm_check_mc_ecc_errVernon Mauery2010-05-181-1/+2
| * | | i7core_edac: fix memory leak of i7core_devAlexander Beregalov2010-05-181-1/+3
| * | | EDAC: add __init to i7core_xeon_pci_fixupJiri Slaby2010-05-181-1/+1
| * | | i7core_edac: Fix wrong device id for channel 1 devicesMauro Carvalho Chehab2010-05-101-4/+4
| * | | i7core: add support for Lynnfield alternate addressMauro Carvalho Chehab2010-05-102-2/+12
| * | | i7core_edac: Add initial support for LynnfieldMauro Carvalho Chehab2010-05-102-2/+52
| * | | i7core_edac: do not export static functionsStephen Rothwell2010-05-101-1/+0
| * | | edac: fix i7core buildRandy Dunlap2010-05-101-0/+3
| * | | edac: i7core_edac produces undefined behaviour on 32bitAlan Cox2010-05-101-12/+12
| * | | i7core_edac: Use a more generic approach for probing PCI devicesMauro Carvalho Chehab2010-05-101-39/+40
| * | | i7core_edac: PCI device is called NONCORE, instead of NOCOREMauro Carvalho Chehab2010-05-102-5/+5
| * | | i7core_edac: Fix ringbuffer maxsizeMauro Carvalho Chehab2010-05-101-6/+6
| * | | i7core_edac: First store, then incrementMauro Carvalho Chehab2010-05-101-7/+6
| * | | i7core_edac: Better parse "any" addrmaskMauro Carvalho Chehab2010-05-101-1/+1
| * | | i7core_edac: Use a lockless ringbufferMauro Carvalho Chehab2010-05-101-28/+55
| * | | edac: Create an unique instance for each kobjMauro Carvalho Chehab2010-05-102-32/+64
| * | | Documentation/edac.txt: Reflect the sysfs changes at the documentMauro Carvalho Chehab2010-05-101-27/+29
| * | | i7core_edac: Convert UDIMM error counters into a proper sysfs groupMauro Carvalho Chehab2010-05-101-37/+44
| * | | edac: Don't create csrow entries on instance groupsMauro Carvalho Chehab2010-05-101-2/+2