summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2006-12-0652-934/+382
|\
| * [PATCH] pcmcia: at91_cf updateAndrew Victor2006-12-051-32/+3
| * [PATCH] pcmcia: fix m32r_cfc.c compilationAdrian Bunk2006-12-051-1/+1
| * [PATCH] pcmcia: ds.c debug enhancementsDominik Brodowski2006-12-051-16/+81
| * [PATCH] pcmcia: at91_cf updateAndrew Victor2006-12-051-14/+20
| * [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidationDominik Brodowski2006-12-0545-614/+47
| * [PATCH] pcmcia: remove prod_id indirectionDominik Brodowski2006-12-057-88/+40
| * [PATCH] pcmcia: remove manf_id and card_id indirectionDominik Brodowski2006-12-0510-85/+45
| * [PATCH] pcmcia: IDs for Elan serial PCMCIA devciesTony Olech2006-12-053-1/+27
| * [PATCH] pcmcia: allow for four multifunction subdevicesDominik Brodowski2006-12-051-2/+2
| * [PATCH] pcmcia: handle __copy_from_user() return value in ioctlDominik Brodowski2006-12-051-1/+6
| * [PATCH] pcmcia: multifunction card handling fixesDominik Brodowski2006-12-052-68/+90
| * [PATCH] pcmcia: allow shared IRQs on pd6729 socketsKomuro2006-12-051-4/+4
| * [PATCH] pcmcia: start over after CIS overrideDominik Brodowski2006-12-053-7/+11
| * [PATCH] cm4000_cs: fix return value checkAkinobu Mita2006-12-052-6/+6
| * [PATCH] pcmcia: yet another IDE IDMarcin Juszkiewicz2006-12-052-0/+2
| * [PATCH] pcmcia: Add an id to ide-cs.cMatt Reimer2006-12-052-0/+2
* | [PATCH] Centralise definitions of sector_t and blkcnt_tMatthew Wilcox2006-12-0510-73/+11
* | Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-blockLinus Torvalds2006-12-051-19/+16
|\ \
| * | [PATCH] blktrace: don't return blktrace_seq from trace_note()Jens Axboe2006-12-041-7/+4
| * | [PATCH] blktrace: uninline trace_note()Jens Axboe2006-12-041-15/+15
* | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2006-12-0529-898/+760
|\ \ \
| * | | ocfs2: implement i_op->permissionTiger Yang2006-12-023-0/+27
| * | | configfs: make configfs_dirent_exists() staticAdrian Bunk2006-12-021-2/+2
| * | | ocfs2: update file system paths to set atimeTiger Yang2006-12-024-6/+28
| * | | ocfs2: core atime update functionsTiger Yang2006-12-027-1/+116
| * | | ocfs2: Add splice supportTiger Yang2006-12-021-50/+137
| * | | ocfs2: Remove ocfs2_write_should_remove_suid()Mark Fasheh2006-12-021-15/+1
| * | | [PATCH] Export should_remove_suid()Mark Fasheh2006-12-021-0/+1
| * | | configfs: mutex_lock_nested() fixMark Fasheh2006-12-021-2/+3
| * | | ocfs2: Remove struct ocfs2_journal_handle in favor of handle_tMark Fasheh2006-12-0220-186/+130
| * | | ocfs2: remove handle argument to ocfs2_start_trans()Mark Fasheh2006-12-0211-46/+30
| * | | ocfs2: remove ocfs2_journal_handle journal fieldMark Fasheh2006-12-022-3/+0
| * | | ocfs2: pass ocfs2_super * into ocfs2_commit_trans()Mark Fasheh2006-12-0211-29/+31
| * | | ocfs2: remove unused handle argument from ocfs2_meta_lock_full()Mark Fasheh2006-12-0214-51/+41
| * | | ocfs2: make ocfs2_alloc_handle() staticMark Fasheh2006-12-022-7/+1
| * | | ocfs2: remove unused ocfs2_handle_add_lock()Mark Fasheh2006-12-024-117/+2
| * | | ocfs2: remove unused ocfs2_handle_add_inode()Mark Fasheh2006-12-025-67/+0
| * | | ocfs2: Don't allocate handle early in ocfs2_rename()Mark Fasheh2006-12-021-8/+1
| * | | ocfs2: don't use handle for locking in allocation functionsMark Fasheh2006-12-027-152/+72
| * | | ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_rename()Mark Fasheh2006-12-021-19/+37
| * | | ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_symlink()Mark Fasheh2006-12-021-9/+12
| * | | ocfs2: don't pass handle to ocfs2_meta_lock in ocfs2_unlink()Mark Fasheh2006-12-021-13/+12
| * | | ocfs2: don't pass handle to ocfs2_meta_lock() in orphan dir codeMark Fasheh2006-12-021-27/+39
| * | | ocfs2: don't pass handle to ocfs2_meta_lock() in ocfs2_link()Mark Fasheh2006-12-021-28/+26
| * | | ocfs2: don't pass handle to ocfs2_meta_lock() in ocfs2_mknod()Mark Fasheh2006-12-021-7/+9
| * | | ocfs2: don't pass handle to ocfs2_meta_lock() in __ocfs2_flush_truncate_log()Mark Fasheh2006-12-021-27/+19
| * | | ocfs2: don't pass handle to ocfs2_meta_lock() in localalloc.cMark Fasheh2006-12-021-44/+40
| * | | ocfs2: remove ocfs2_journal_handle flags fieldMark Fasheh2006-12-024-32/+4
| * | | ocfs2: have ocfs2_extend_trans() take handle_tMark Fasheh2006-12-024-10/+6