summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sbp-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2012-05-2311-15/+2920
|\
| * sbp-target: Initial merge of firewire/ieee-1394 target mode supportChris Boot2012-05-097-0/+2895
| * firewire: Move fw_card kref functions into linux/firewire.hChris Boot2012-05-093-15/+15
| * firewire: Add function to get speed from opaque struct fw_requestChris Boot2012-05-092-0/+10
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2012-05-2330-511/+5777
|\ \
| * | crypto: aesni-intel - move more common code to ablk_init_commonJussi Kivilinna2012-05-151-55/+15
| * | crypto: aesni-intel - use crypto_[un]register_algsJussi Kivilinna2012-05-151-420/+303
| * | crypto: ux500 - Cleanup hardware identificationAndreas Westin2012-05-153-17/+4
| * | crypto: ux500 - Update DMA handling for 3.4Andreas Westin2012-05-152-4/+3
| * | mach-ux500: crypto - core support for CRYP/HASH module.Andreas Westin2012-05-158-8/+126
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linuxHerbert Xu2012-05-152876-52365/+112488
| |\ \
| * | | crypto: ux500 - Add driver for HASH hardwareAndreas Westin2012-05-046-0/+2440
| * | | crypto: ux500 - Add driver for CRYP hardwareAndreas Westin2012-05-0413-0/+2878
| * | | hwrng: Kconfig - modify default state for atmel-rng driverNicolas Ferre2012-04-301-1/+1
| * | | hwrng: omap - use devm_request_and_ioremapJulia Lawall2012-04-271-20/+2
| * | | crypto: crypto4xx - move up err_request_irq labelJulia Lawall2012-04-271-1/+1
| * | | crypto, xor: Sanitize checksumming function selection outputBorislav Petkov2012-04-091-2/+3
| * | | crypto: caam - add backward compatible string sec4.0Shengzhou Liu2012-03-292-4/+26
* | | | Merge git://www.linux-watchdog.org/linux-watchdogLinus Torvalds2012-05-2319-396/+447
|\ \ \ \
| * | | | Documentation/watchdog: Fix the file descriptor leak when no cmdline arg givenDevendra Naga2012-05-231-0/+11
| * | | | Documentation/watchdog: close the fd when cmdline arg givenDevendra Naga2012-05-231-3/+6
| * | | | Documentation/watchdog: Fix a small typoDevendra Naga2012-05-231-1/+1
| * | | | watchdog: s3c2410_wdt: Set timeout to actually achieved timeoutHans de Goede2012-05-231-1/+1
| * | | | watchdog: wm831x: Convert to gpio_request_one()Mark Brown2012-05-231-10/+3
| * | | | watchdog: via_wdt: depends on PCIRandy Dunlap2012-05-231-1/+1
| * | | | watchdog: ie6xx_wdt needs io.hRandy Dunlap2012-05-231-0/+1
| * | | | watchdog: ie6xx_wdt.c: fix printk format warningRandy Dunlap2012-05-231-2/+2
| * | | | watchdog: Add watchdog driver for Intel Atom E6XXAlexander Stein2012-05-233-0/+361
| * | | | watchdog: it87_wdt: Add support for IT8728F watchdog.Diego Elio Pettenò2012-05-232-3/+11
| * | | | watchdog: i6300esb: don't depend on X86Michael Olbrich2012-05-231-1/+1
| * | | | watchdog: Use module_pci_driverWim Van Sebroeck2012-05-235-88/+9
| * | | | watchdog: sch311x_wdt.c: Remove RESGENDave Mueller2012-05-231-34/+5
| * | | | watchdog: s3c2410-wdt: Use of_match_ptr().Wim Van Sebroeck2012-05-231-3/+2
| * | | | watchdog: Device tree support for pnx4008-wdtRoland Stigge2012-05-232-0/+23
| * | | | watchdog: ar7_wdt.c: use devm_request_and_ioremapJulia Lawall2012-05-231-23/+10
| * | | | watchdog: remove ixp2000 driverRob Herring2012-05-233-227/+0
| * | | | watchdog: sp5100_tco.c: quiet sparse noise about using plain integer was NULL...H Hartley Sweeten2012-05-231-1/+1
* | | | | Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/j...Linus Torvalds2012-05-238-4/+1120
|\ \ \ \ \
| * | | | | PATA host controller driver for ep93xxRafal Prylowski2012-05-223-0/+1054
| * | | | | [libata] Add " 2GB ATA Flash Disk"/"ADMA428M" to DMA blacklistPrarit Bhargava2012-05-221-0/+1
| * | | | | ata_generic: Skip is_intel_ider() check when ata_generic=1 is setAndi Kleen2012-05-221-1/+1
| * | | | | libata-eh don't waste time retrying media errors (v3)Mark Lord2012-05-071-3/+21
| * | | | | ata_piix: defer disks to the Hyper-V drivers by defaultAndy Whitcroft2012-05-071-0/+36
| * | | | | libata: add a host flag to ignore detected ATA devicesAndy Whitcroft2012-05-072-0/+7
* | | | | | Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-05-2313-347/+902
|\ \ \ \ \ \
| * | | | | | hwmon: (it87) Make temp3 attribute conditional for IT8782FGuenter Roeck2012-05-221-20/+61
| * | | | | | hwmon: (it87) Convert to use devm_kzalloc and devm_request_regionGuenter Roeck2012-05-221-34/+20
| * | | | | | hwmon: INA219 and INA226 supportFelten, Lothar2012-05-225-0/+430
| * | | | | | hwmon: (it87) Create voltage attributes only if voltage is enabledGuenter Roeck2012-05-201-38/+124
| * | | | | | hwmon: (ntc_thermistor) Fix checkpatch warningGuenter Roeck2012-05-201-6/+6
OpenPOWER on IntegriCloud