summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2008-01-252-4/+10
|\
| * [CRYPTO] hifn795x: Disallow built-in hifn795x when HW_RANDOM is mHerbert Xu2008-01-262-4/+10
* | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-01-2553-1592/+2005
|\ \
| * | ocfs2: clean up bh null checksMark Fasheh2008-01-252-15/+8
| * | ocfs2: document access rules for blocked_lock_listMark Fasheh2008-01-251-0/+6
| * | configfs: file.c fix possible recursive lockingJoonwoo Park2008-01-251-1/+1
| * | configfs: dir.c fix possible recursive lockingJoonwoo Park2008-01-251-2/+3
| * | configfs: Remove EXPERIMENTALJoel Becker2008-01-251-2/+2
| * | ocfs2: bump version numberMark Fasheh2008-01-254-4/+4
| * | ocfs2/dlm: Clear joining_node on hearbeat node downTao Ma2008-01-251-6/+6
| * | ocfs2: convert byte order of constant instead of variableMarcin Slusarz2008-01-252-6/+1
| * | ocfs2: Update default cluster timeoutsSunil Mushran2008-01-252-3/+3
| * | ocfs2: printf fixesJan Kara2008-01-251-2/+2
| * | ocfs2: Use generic_file_llseekJan Kara2008-01-251-0/+2
| * | ocfs2: Safer read_inline_data()Jan Kara2008-01-251-3/+4
| * | ocfs2: Silence false lockdep warningsJan Kara2008-01-257-11/+20
| * | [PATCH 2/2] ocfs2: cluster aware flock()Mark Fasheh2008-01-257-1/+237
| * | [PATCH 1/2] ocfs2: add flock lock typeMark Fasheh2008-01-255-0/+284
| * | ocfs2: Local alloc window size changeable via mount optionSunil Mushran2008-01-256-14/+62
| * | ocfs2: Support commit= mount optionMark Fasheh2008-01-254-2/+41
| * | ocfs2: Add missing permission checksMark Fasheh2008-01-251-0/+6
| * | [PATCH 2/2] ocfs2: Implement group add for online resizeTao Ma2008-01-255-1/+269
| * | [PATCH 1/2] ocfs2: Add group extend for online resizeTao Ma2008-01-2510-7/+518
| * | ocfs2: Reserve ioctl rangeTao Ma2008-01-251-0/+1
| * | ocfs2: Initalize bitmap_cpg of ocfs2_super to be the maximum.Tao Ma2008-01-251-18/+1
| * | ocfs2: Documentation updateMark Fasheh2008-01-252-9/+2
| * | ocfs2: Readpages supportMark Fasheh2008-01-251-2/+66
| * | dlm: Split lock mode and flag constants into a sharable header.Joel Becker2008-01-253-138/+162
| * | ocfs2: Rename ocfs2_meta_[un]lockMark Fasheh2008-01-2516-144/+144
| * | ocfs2: Remove data locksMark Fasheh2008-01-259-214/+22
| * | ocfs2: Add data downconvert worker to inode lockMark Fasheh2008-01-251-0/+5
| * | ocfs2: Remove mount/unmount votesMark Fasheh2008-01-2515-967/+179
| * | ocfs2: Remove fs dependency on ocfs2_heartbeat moduleMark Fasheh2008-01-253-83/+0
| * | ocfs2_dlm: Call node eviction callbacks from heartbeat handlerMark Fasheh2008-01-251-0/+7
| |/
* | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-01-2548-1323/+2851
|\ \
| * | fix drivers/ata/sata_fsl.c double-declakpm@linux-foundation.org2008-01-231-1/+0
| * | [libata] Prefer SCSI_SENSE_BUFFERSIZE to sizeof()James Bottomley2008-01-231-1/+1
| * | pata_legacy: Merge winbond supportAlan Cox2008-01-231-34/+144
| * | ata_generic: Cenatek supportAlan Cox2008-01-232-1/+9
| * | pata_winbond: error returnAlan Cox2008-01-231-1/+1
| * | pata_serverworks: Fix cable types and cosmeticsAlan Cox2008-01-231-5/+4
| * | pata_mpc52xx: remove un-needed assignmentAlan Cox2008-01-231-1/+1
| * | libata: fix off-by-one in error categorizationTejun Heo2008-01-231-7/+6
| * | ahci: factor out AHCI enabling and enable AHCI before reading CAPTejun Heo2008-01-231-7/+20
| * | ata_piix: implement SIDPR SCR accessTejun Heo2008-01-231-4/+247
| * | ata_piix: convert to prepare - activate initializationTejun Heo2008-01-231-42/+37
| * | libata: factor out ata_pci_activate_sff_host() from ata_pci_one()Tejun Heo2008-01-233-84/+107
| * | [libata] Prefer SCSI_SENSE_BUFFERSIZE to sizeof()akpm@linux-foundation.org2008-01-231-1/+1
| * | pata_legacy: resychronize with upstream changes and resubmitAlan Cox2008-01-231-145/+605
| * | [libata] pata_legacy: typo fixAndrew Morton2008-01-231-1/+1
OpenPOWER on IntegriCloud