summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "tty: Add a new file /proc/tty/consoles"Linus Torvalds2010-10-232-190/+0
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu...Linus Torvalds2010-10-2333-1257/+1339
|\
| * nilfs2: eliminate sparse warning - "context imbalance"Jiro SEKIBA2010-10-231-0/+2
| * nilfs2: eliminate sparse warnings - "symbol not declared"Jiro SEKIBA2010-10-232-2/+3
| * nilfs2: get rid of bdi from nilfs objectRyusuke Konishi2010-10-235-9/+7
| * nilfs2: change license of exported header fileRyusuke Konishi2010-10-231-4/+4
| * nilfs2: add bdev freeze/thaw supportRyusuke Konishi2010-10-233-4/+58
| * nilfs2: accept 64-bit checkpoint numbers in cp mount optionRyusuke Konishi2010-10-231-13/+12
| * nilfs2: remove own inode allocator and destructor for metadata filesRyusuke Konishi2010-10-234-124/+2
| * nilfs2: get rid of back pointer to writable sb instanceRyusuke Konishi2010-10-235-61/+2
| * nilfs2: get rid of mi_nilfs back pointer to nilfs objectRyusuke Konishi2010-10-234-15/+8
| * nilfs2: see state of root dentry for mount check of snapshotsRyusuke Konishi2010-10-236-37/+53
| * nilfs2: use iget for all metadata filesRyusuke Konishi2010-10-2314-156/+207
| * nilfs2: get rid of GCDAT inodeRyusuke Konishi2010-10-2312-171/+41
| * nilfs2: add routines to redirect access to buffers of DAT fileRyusuke Konishi2010-10-235-0/+75
| * nilfs2: add routines to roll back state of DAT fileRyusuke Konishi2010-10-235-19/+145
| * nilfs2: add routines to save and restore bmap stateRyusuke Konishi2010-10-232-0/+26
| * nilfs2: do not allocate nilfs_mdt_info structure to gc-inodesRyusuke Konishi2010-10-231-16/+16
| * nilfs2: allow nilfs_clear_inode to clear metadata file inodesRyusuke Konishi2010-10-231-0/+4
| * nilfs2: get rid of snapshot mount flagRyusuke Konishi2010-10-231-1/+0
| * nilfs2: simplify life cycle management of nilfs objectRyusuke Konishi2010-10-234-131/+31
| * nilfs2: do not allocate multiple super block instances for a deviceRyusuke Konishi2010-10-234-225/+101
| * nilfs2: split out nilfs_attach_snapshotRyusuke Konishi2010-10-231-28/+45
| * nilfs2: split out nilfs_get_root_dentryRyusuke Konishi2010-10-231-19/+35
| * nilfs2: deny write access to inodes in snapshotsRyusuke Konishi2010-10-233-3/+13
| * nilfs2: use checkpoint tree for mount check of snapshotsRyusuke Konishi2010-10-231-17/+11
| * nilfs2: move inode count and block count into root objectRyusuke Konishi2010-10-234-11/+10
| * nilfs2: use root object to get ifileRyusuke Konishi2010-10-237-80/+67
| * nilfs2: make snapshots in checkpoint tree exportableRyusuke Konishi2010-10-235-71/+151
| * nilfs2: set pointer to root object in inodesRyusuke Konishi2010-10-235-20/+68
| * nilfs2: add checkpoint tree to nilfs objectRyusuke Konishi2010-10-232-0/+134
| * nilfs2: remove own inode hash used for GCRyusuke Konishi2010-10-237-142/+64
| * nilfs2: separate initializer of metadata file inodeRyusuke Konishi2010-10-233-19/+35
| * nilfs2: use iget5_locked to get inodeRyusuke Konishi2010-10-232-3/+35
| * nilfs2: keep zero value in i_cno except for gc-inodesRyusuke Konishi2010-10-233-16/+24
| * nilfs2: allow nilfs_dirty_inode to mark metadata file inodes dirtyRyusuke Konishi2010-10-231-0/+5
| * nilfs2: allow nilfs_destroy_inode to destroy metadata file inodesRyusuke Konishi2010-10-232-2/+6
| * nilfs2: accept future revisionsRyusuke Konishi2010-10-232-2/+3
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap...Linus Torvalds2010-10-2265-839/+3431
|\ \
| * | Blackfin: bfin_spi.h: add MMR peripheral layoutMike Frysinger2010-10-221-0/+19
| * | Blackfin: bfin_ppi.h: start a common PPI/EPPI headerMike Frysinger2010-10-221-0/+51
| * | Blackfin: bfin_can.h: add missing VERSION/VERSION2 MMRsMike Frysinger2010-10-221-3/+6
| * | Blackfin: bf538: add missing SIC_RVECT defineMike Frysinger2010-10-221-0/+1
| * | Blackfin: bf561: rewrite SICA_xxx to just SIC_xxxMike Frysinger2010-10-228-157/+87
| * | Blackfin: bf54x: add missing SIC_RVECT definitionMike Frysinger2010-10-222-0/+3
| * | Blackfin: H8606: move 8250 irqflags to platform resourcesMike Frysinger2010-10-222-1/+2
| * | Blackfin: glue XIP/ROM kernel kconfigsMike Frysinger2010-10-221-0/+6
| * | Blackfin: update sparse flags for latest upstream changesMike Frysinger2010-10-221-2/+1
| * | Blackfin: coreb: update ioctl numbersMike Frysinger2010-10-221-3/+3
| * | Blackfin: coreb: add gpl module licenseMike Frysinger2010-10-221-0/+1