projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d3f8fd7 7220c01)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 7 Feb 2007 16:10:48 +0000 (08:10 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 7 Feb 2007 16:10:48 +0000 (08:10 -0800)
commit5331be090567d9335476f876b2d85427cd7c4426
tree356842da9d4c3966a9781f6eb05fa77beec144bctree | snapshot
parentd3f8fd765e94b9137e1f27bbb0ac25289f9e565ccommit | diff
parent7220c0177b45600eef2cfd3e5e57ab5b96f3222ccommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/shaggy/jfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  JFS: Remove incorrect kgdb define
  JFS: call io_schedule() instead of schedule() to avoid deadlock
  JFS: Add lockdep annotations
  JFS: Avoid BUG() on a damaged file system
John Crispins staging tree