summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linuxLinus Torvalds2011-05-258-115/+263
|\
| *---. Merge branches 'for-2639/i2c-eg20t', 'for-2639/i2c-shmobile', 'for-2639/i2c-t...Ben Dooks2011-05-255084-325333/+334116
| |\ \ \
| | | | * mach-ux500: set proper I2C platform data from MOP500sLinus Walleij2011-05-251-6/+8
| | | | * i2c-nomadik: break out single messsage transmissionLinus Walleij2011-05-251-32/+48
| | | | * i2c-nomadik: reset the hw after status checkVirupax Sadashivpetimath2011-05-251-4/+4
| | | | * i2c-nomadik: remove the unnecessary delayVirupax Sadashivpetimath2011-05-251-18/+2
| | | | * i2c-nomadik: change the TX and RX thresholdVirupax Sadashivpetimath2011-05-251-13/+26
| | | | * i2c-nomadik: add code to retry on timeout failureVirupax Sadashivpetimath2011-05-251-48/+49
| | | | * i2c-nomadik: use pm_runtime APIRabin Vincent2011-05-251-6/+31
| | | | * i2c-nomadik: print abort cause only on abort tagVirupax Sadashivpetimath2011-05-251-8/+19
| | | | * i2c-nomadik: correct adapter timeout initializationVirupax Sadashivpetimath2011-05-251-4/+5
| | | | * i2c-nomadik: remove the redundant error messagesrinidhi kasagar2011-05-251-2/+0
| | | | * i2c-nomadik: corrrect returned error numbersVirupax Sadashivpetimath2011-05-251-4/+6
| | | | * i2c-nomadik: fix speed enumeratorLinus Walleij2011-05-251-1/+1
| | | | * i2c-nomadik: make i2c timeout specific per i2c busVirupax Sadashivpetimath2011-05-252-8/+8
| | | | * i2c-nomadik: add regulator supportJonas Aberg2011-05-251-15/+58
| | | * | i2c: tegra: Add de-bounce cycles.Jay Cheng2011-05-111-1/+3
| | | * | i2c: tegra: fix repeated start handlingErik Gilling2011-05-111-2/+2
| | | * | i2c: tegra: recover from spurious interrupt stormTodd Poynor2011-05-111-2/+24
| | | * | i2c: tegra: Enable new slave mode.Kenneth Waters2011-05-111-0/+5
| | * | | i2c: i2c-sh_mobile bus speed platform data V2Magnus Damm2011-05-112-2/+21
| | * | | i2c: i2c-sh_mobile clock string removalMagnus Damm2011-05-111-4/+2
| | |/ /
| * / / i2c-eg20t: Support new device ML7223 IOHTomoya MORINAGA2011-05-112-3/+9
| |/ /
* | | Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-05-257-83/+97
|\ \ \
| * | | i2c-parport: Various cleanupsJean Delvare2011-05-243-59/+55
| * | | i2c-i801: Don't depend on other kernel driver config optionsJean Delvare2011-05-242-10/+7
| * | | i2c-i801: Check for vendor Fujitsu before probing for apanelJean Delvare2011-05-241-1/+2
| * | | i2c-i801: Don't probe for slaves on IDF channelsJean Delvare2011-05-241-15/+31
| * | | i2c-i801: SMBus patch for Intel Panther Point DeviceIDsSeth Heasley2011-05-243-1/+5
| * | | i2c/writing-clients: Fix foo_driver.id_tableVikram Narayanan2011-05-241-1/+1
| | |/ | |/|
* | | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac...Linus Torvalds2011-05-256-32/+91
|\ \ \
| * | | jbd: Fix comment to match the code in journal_start()Eryu Guan2011-05-241-1/+2
| * | | jbd/jbd2: remove obsolete summarise_journal_usage.Tao Ma2011-05-172-12/+0
| * | | jbd: Fix forever sleeping process in do_get_write_access()Jan Kara2011-05-171-2/+7
| * | | ext2: fix error msg when mounting fs with too-large blocksizeRobin Dong2011-05-171-1/+2
| * | | jbd: fix fsync() tid wraparound bugTed Ts'o2011-05-171-3/+13
| * | | ext3: Fix fs corruption when make_indexed_dir() failsJan Kara2011-05-171-3/+12
| * | | ext3: Fix lock inversion in ext3_symlink()Jan Kara2011-04-291-11/+56
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tei...Linus Torvalds2011-05-259-51/+223
|\ \ \ \
| * | | | dlm: make plock operation killableDavid Teigland2011-05-232-6/+65
| * | | | dlm: remove shared message stub for recoveryDavid Teigland2011-04-052-33/+50
| * | | | dlm: delayed reply message warningDavid Teigland2011-04-016-11/+108
| * | | | dlm: Remove superfluous call to recalc_sigpending()Matt Fleming2011-03-281-1/+0
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2011-05-2439-284/+603
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into fo...James Morris2011-05-2414-220/+398
| |\ \ \ \ \
| | * | | | | SELINUX: add /sys/fs/selinux mount point to put selinuxfsGreg Kroah-Hartman2011-05-111-1/+11
| | * | | | | SELinux: introduce path_has_permEric Paris2011-04-281-14/+30
| | * | | | | flex_array: allow 0 length elementsEric Paris2011-04-281-6/+20
| | * | | | | flex_arrays: allow zero length flex arraysEric Paris2011-04-281-1/+10
| | * | | | | flex_array: flex_array_prealloc takes a number of elements, not an endEric Paris2011-04-284-11/+14