summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2011-07-3115-124/+31
|\
| * smc91c92_cs.c: fix bogus compiler warningDominik Brodowski2011-07-291-1/+1
| * orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002Pavel Roskin2011-07-291-1/+4
| * hostap_cs: support cards with "Version 01.02" as third product IDPavel Roskin2011-07-291-0/+2
| * pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3Pavel Roskin2011-07-291-0/+9
| * pxa2xx pcmcia - stargate 2 use gpio array.Jonathan Cameron2011-07-291-23/+11
| * pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.Jonathan Cameron2011-07-299-96/+0
| * drivers:pcmcia:soc_common: make socket_init and socket_suspend optionalJonathan Cameron2011-07-291-3/+4
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-07-301-1/+2
|\ \
| * | sungem: fix compile failure caused by trivial #include consolidationJiri Kosina2011-07-291-1/+2
* | | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2011-07-3034-284/+3229
|\ \ \
| * | | hwmon: (lm90) Refactor reading of config2 registerJean Delvare2011-07-291-19/+6
| * | | hwmon: (lm90) Make SA56004 detection more robustJean Delvare2011-07-291-2/+13
| * | | hwmon: (lm90) Simplify handling of extended local temp registerJean Delvare2011-07-291-15/+6
| * | | hwmon: (pmbus) Add client driver for LM25066, LM5064, and LM5066Guenter Roeck2011-07-296-1/+444
| * | | hwmon: (max34440) Add support for peak attributesGuenter Roeck2011-07-292-0/+69
| * | | hwmon: (max8688) Add support for peak attributesGuenter Roeck2011-07-292-0/+67
| * | | hwmon: (max16064) Add support for peak attributesGuenter Roeck2011-07-292-0/+55
| * | | hwmon: (adm1275) Add support for peak attributesGuenter Roeck2011-07-292-2/+66
| * | | hwmon: (pmbus) Add support for peak attributesGuenter Roeck2011-07-292-15/+163
| * | | hwmon: Add new attributes to sysfs ABIGuenter Roeck2011-07-291-0/+46
| * | | hwmon: (pmbus) Strengthen check for status register existenceGuenter Roeck2011-07-291-21/+23
| * | | hwmon: (pmbus) Add support for virtual pagesGuenter Roeck2011-07-292-28/+20
| * | | hwmon: (pmbus) Support reading and writing of word registers in device specif...Guenter Roeck2011-07-292-6/+50
| * | | hwmon: (pmbus) Increase attribute name sizeGuenter Roeck2011-07-291-4/+6
| * | | hwmon: (pmbus) Add ADP4000, NCP4200 and NCP4208 to list of supported devicesGuenter Roeck2011-07-293-2/+12
| * | | hwmon: (pmbus) Add support for VID output voltage modeGuenter Roeck2011-07-297-34/+105
| * | | hwmon: (pmbus) Move PMBus drivers to drivers/hwmon/pmbusGuenter Roeck2011-07-2814-95/+115
| * | | hwmon: (coretemp) Add core/pkg threshold support to CoretempDurgadoss R2011-07-282-45/+139
| * | | hwmon: (lm95241) Add support for LM95231Guenter Roeck2011-07-282-14/+22
| * | | hwmon: LM95245 driverAlexander Stein2011-07-284-0/+586
| * | | hwmon: (lm90) Add support for Philips SA56004Stijn Devriendt2011-07-283-5/+46
| * | | hwmon: Driver for NTC ThermistorsDonggeun Kim2011-07-285-0/+614
| * | | hwmon: (max1668) Add support for tempX_fault attributesGuenter Roeck2011-07-281-4/+26
| * | | hwmon: Driver for MAX1668David George2011-07-285-0/+558
| | |/ | |/|
* | | shm: optimize locking and ipc_namespace gettingVasiliy Kulikov2011-07-301-33/+28
* | | shm: handle separate PID namespaces caseVasiliy Kulikov2011-07-302-7/+23
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6Linus Torvalds2011-07-3093-4489/+11879
|\ \ \
| * | | [SCSI] fcoe: cleanup cpu selection for incoming requestsVasu Dev2011-07-281-30/+13
| * | | [SCSI] fcoe: add fip retry to avoid missing critical keep aliveVasu Dev2011-07-281-6/+15
| * | | [SCSI] libfc: fix warn on in lport retryVasu Dev2011-07-281-1/+0
| * | | [SCSI] libfc: Remove the reference to FCP packet from scsi_cmnd in case of errorNeerav Parikh2011-07-281-0/+1
| * | | [SCSI] libfc: cleanup sending SRR requestHillf Danton2011-07-281-2/+0
| * | | [SCSI] libfc: two minor changes in commentsHillf Danton2011-07-281-2/+2
| * | | [SCSI] libfc, fcoe: ignore rx frame with wrong xid infoVasu Dev2011-07-282-3/+5
| * | | [SCSI] libfc: release exchg cacheHillf Danton2011-07-281-1/+4
| * | | [SCSI] libfc: use FC_MAX_ERROR_CNTHillf Danton2011-07-281-1/+1
| * | | [SCSI] fcoe: remove unused ptype field in fcoe_rcv_infoYi Zou2011-07-283-3/+0
| * | | [SCSI] bnx2fc: Update copyright and bump version to 1.0.4Bhanu Prakash Gollapudi2011-07-286-8/+8
| * | | [SCSI] bnx2fc: Tx BDs cache in write tasksBhanu Prakash Gollapudi2011-07-281-7/+22