summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-07-308-3/+1033
|\
| * Merge branch 'next' into for-linusDmitry Torokhov2012-07-298-3/+1033
| |\
| | * Input: synaptics - handle out of bounds values from the hardwareSeth Forshee2012-07-241-0/+22
| | * Input: wacom - add support to Cintiq 22HDPing Cheng2012-07-242-3/+21
| | * Input: add driver for FT5x06 based EDT displaysSimon Budig2012-07-245-0/+990
* | | Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-07-303-34/+66
|\ \ \
| * | | hwmon: (applesmc) Decode and act on read/write status codesHenrik Rydberg2012-07-271-24/+46
| * | | hwmon: (jc42) Don't reset hysteresis on device removalJean Delvare2012-07-271-3/+10
| * | | hwmon: (jc42) Simplify hysteresis maskJean Delvare2012-07-271-7/+6
| * | | hwmon: (acpi_power_meter) Fix build warningGuenter Roeck2012-07-271-0/+4
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edacLinus Torvalds2012-07-3048-2555/+3471
|\ \ \ \
| * \ \ \ Merge branch 'devel'Mauro Carvalho Chehab2012-07-2948-2555/+3471
| |\ \ \ \
| | * | | | edac i5000, i5400: fix pointer math in i5000_get_mc_regs()Dan Carpenter2012-06-272-6/+18
| | * | | | edac: allow specifying the error count with fake_injectMauro Carvalho Chehab2012-06-272-2/+14
| | * | | | edac: add support for Calxeda highbank L2 cache eccRob Herring2012-06-275-0/+178
| | * | | | edac: add support for Calxeda highbank memory controllerRob Herring2012-06-275-1/+294
| | * | | | edac: create top-level debugfs directoryRob Herring2012-06-123-1/+39
| | * | | | sb_edac: properly handle error countMauro Carvalho Chehab2012-06-121-4/+3
| | * | | | i7core_edac: properly handle error countMauro Carvalho Chehab2012-06-121-21/+12
| | * | | | edac: edac_mc_handle_error(): add an error_count parameterMauro Carvalho Chehab2012-06-1228-95/+104
| | * | | | edac: remove arch-specific parameter for the error handlerMauro Carvalho Chehab2012-06-1128-86/+73
| | * | | | amd64_edac: Don't pass driver name as an error parameterMauro Carvalho Chehab2012-06-111-12/+13
| | * | | | edac_mc: check for allocation failure in edac_mc_alloc()Dan Carpenter2012-06-111-0/+2
| | * | | | edac: Increase version to 3.0.0Mauro Carvalho Chehab2012-06-111-1/+1
| | * | | | edac_mc: Cleanup per-dimm_info debug messagesMauro Carvalho Chehab2012-06-113-47/+62
| | * | | | edac: Convert debugfX to edac_dbg(X,Joe Perches2012-06-1130-962/+921
| | * | | | edac: Use more normal debugging macro styleJoe Perches2012-06-114-76/+49
| | * | | | edac: Don't add __func__ or __FILE__ for debugf[0-9] msgsMauro Carvalho Chehab2012-06-1126-357/+331
| | * | | | Edac: Add ABI Documentation for the new device nodesMauro Carvalho Chehab2012-06-111-0/+64
| | * | | | edac: move documentation ABI to ABI/testing/sysfs-devices-edacMauro Carvalho Chehab2012-06-112-104/+84
| | * | | | i7core_edac: change the mem allocation scheme to make Documentation/kobject.t...Mauro Carvalho Chehab2012-06-111-21/+35
| | * | | | edac: change the mem allocation scheme to make Documentation/kobject.txt happyMauro Carvalho Chehab2012-06-1122-164/+242
| | * | | | edac: Only expose csrows/channels on legacy API if they're populatedMauro Carvalho Chehab2012-06-111-0/+24
| | * | | | edac: Move grain/dtype/edac_type calculus to be out of channel loopMauro Carvalho Chehab2012-06-113-57/+60
| | * | | | edac: Add debufs nodes to allow doing fake error injectMauro Carvalho Chehab2012-06-112-0/+94
| | * | | | edac: add a sysfs node to report the maximum location for the systemMauro Carvalho Chehab2012-06-111-0/+19
| | * | | | edac: add a new per-dimm API and make the old per-virtual-rank API obsoleteMauro Carvalho Chehab2012-06-112-1/+172
| | * | | | edac: Get rid of the old kobj's from the edac mc codeMauro Carvalho Chehab2012-06-114-38/+0
| | * | | | i7core_edac: convert it to use struct deviceMauro Carvalho Chehab2012-06-111-129/+209
| | * | | | amd64_edac: convert sysfs logic to use struct deviceMauro Carvalho Chehab2012-06-114-122/+167
| | * | | | mpc85xx_edac: convert sysfs logic to use struct deviceMauro Carvalho Chehab2012-06-111-38/+55
| | * | | | edac: rewrite the sysfs code to use struct deviceMauro Carvalho Chehab2012-06-115-706/+450
| | * | | | edac: use Documentation-nano format for some data structsMauro Carvalho Chehab2012-06-111-23/+59
| | * | | | edac: Rename the parent dev to pdevMauro Carvalho Chehab2012-06-1128-56/+56
| | * | | | RAS: Add a tracepoint for reporting memory controller eventsMauro Carvalho Chehab2012-06-113-20/+162
| * | | | | Merge tag 'v3.5'Mauro Carvalho Chehab2012-07-291267-7160/+12942
| |\ \ \ \ \
* | \ \ \ \ \ Merge tag 'boards2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-07-3016-153/+1126
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'board-specific' of git://github.com/hzhuang1/linux into late/boardArnd Bergmann2012-07-25563-2298/+3779
| |\ \ \ \ \ \ \
| | * | | | | | | ARM: pxa: hx4700: Use DEFINE_RES_* macros consistentlyPaul Parsons2012-07-011-44/+12
| | * | | | | | | ARM: pxa: remove eseries.hPaul Bolle2012-07-011-14/+0
OpenPOWER on IntegriCloud