summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac...Linus Torvalds2011-07-2623-271/+1420
|\
| * jbd: change the field "b_cow_tid" of struct journal_head from type unsigned t...Wang Sheng-Hui2011-07-251-1/+1
| * ext3.txt: update the links in the section "useful links" to the latest onesWang Sheng-Hui2011-07-251-2/+2
| * ext3: Fix data corruption in inodes with journalled dataJan Kara2011-07-231-5/+35
| * ext2: check xattr name_len before acquiring xattr_sem in ext2_xattr_getWang Sheng-Hui2011-07-221-5/+5
| * ext3: Fix compilation with -DDX_DEBUGBernd Schubert2011-07-201-2/+2
| * quota: Remove unused declarationJan Kara2011-07-201-8/+0
| * jbd: Use WRITE_SYNC in journal checkpoint.Tao Ma2011-06-281-1/+5
| * jbd: Fix oops in journal_remove_journal_head()Jan Kara2011-06-275-138/+104
| * ext3: Return -EINVAL when start is beyond the end of fs in ext3_trim_fs()Lukas Czerner2011-06-251-3/+1
| * ext3/ioctl.c: silence sparse warnings about different address spacesH Hartley Sweeten2011-06-251-2/+2
| * ext3/ext4 Documentation: remove bh/nobh since it has been deprecatedLukas Czerner2011-06-252-25/+7
| * ext3: Improve truncate error handlingJan Kara2011-06-251-38/+63
| * ext3: use proper little-endian bitopsAkinobu Mita2011-06-251-3/+2
| * ext2: include fs.h into ext2_fs.hPetr Uzel2011-06-251-0/+1
| * ext3: Fix oops in ext3_try_to_allocate_with_rsv()Jan Kara2011-06-251-2/+10
| * jbd: fix a bug of leaking jh->b_jcountDing Dinghua2011-06-251-1/+1
| * jbd: remove dependency on __GFP_NOFAILJan Kara2011-06-251-4/+4
| * ext3: Convert ext3 to new truncate calling conventionJan Kara2011-06-253-18/+12
| * jbd: Add fixed tracepointsLukas Czerner2011-06-254-0/+222
| * ext3: Add fixed tracepointsLukas Czerner2011-06-257-16/+946
* | Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-07-2613-163/+1547
|\ \
| * | x86, olpc-xo15-sci: Enable EC wakeup capabilityDaniel Drake2011-07-241-1/+1
| * | x86, olpc: Fix dependency on POWER_SUPPLYDaniel Drake2011-07-241-2/+4
| * | x86, olpc: Add XO-1.5 SCI driverDaniel Drake2011-07-064-0/+187
| * | x86, olpc: Add XO-1 RTC driverDaniel Drake2011-07-065-0/+99
| * | x86, olpc-xo1-sci: Propagate power supply/battery eventsDaniel Drake2011-07-062-1/+40
| * | x86, olpc-xo1-sci: Add lid switch functionalityDaniel Drake2011-07-063-1/+208
| * | x86, olpc-xo1-sci: Add GPE handler and ebook switch functionalityDaniel Drake2011-07-064-3/+209
| * | x86, olpc: EC SCI wakeup mask functionalityDaniel Drake2011-07-062-6/+111
| * | x86, olpc: Add XO-1 SCI driver and power button controlDaniel Drake2011-07-064-0/+209
| * | x86, olpc: Add XO-1 suspend/resume supportDaniel Drake2011-07-066-6/+234
| * | x86, olpc: Rename olpc-xo1 to olpc-xo1-pmDaniel Drake2011-07-063-32/+20
| * | x86, olpc: Move CS5536-related constants to cs5535.hDaniel Drake2011-07-062-18/+29
| * | x86, olpc: Add missing elements to device treeDaniel Drake2011-07-061-0/+103
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2011-07-266-274/+286
|\ \ \
| * | | cifs: Cleanup: check return codes of crypto api callsShirish Pargaonkar2011-07-263-23/+103
| * | | CIFS: Fix oops while mounting with prefixpathPavel Shilovsky2011-07-261-1/+1
| * | | [CIFS] Redundant null check after dereferenceSteve French2011-07-261-5/+0
| * | | cifs: use cifs_dirent in cifs_save_resume_keyChristoph Hellwig2011-07-252-58/+10
| * | | cifs: use cifs_dirent to replace cifs_get_name_from_search_bufChristoph Hellwig2011-07-251-86/+23
| * | | cifs: introduce cifs_direntChristoph Hellwig2011-07-251-69/+125
| * | | cifs: cleanup cifs_filldirChristoph Hellwig2011-07-251-44/+36
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ros...Linus Torvalds2011-07-262-149/+963
|\ \ \ \
| * | | | ktest: Fix bug when ADD_CONFIG is set but MIN_CONFIG is notSteven Rostedt2011-07-161-12/+7
| * | | | ktest: Keep fonud configs separate from default configsSteven Rostedt2011-07-161-4/+8
| * | | | ktest: Add prompt to use OUTPUT_MIN_CONFIGSteven Rostedt2011-07-162-14/+59
| * | | | ktest: Use Kconfig dependencies to shorten time to make min_configSteven Rostedt2011-07-162-22/+273
| * | | | ktest: Add test type make_min_configSteven Rostedt2011-07-162-4/+301
| * | | | ktest: Require one TEST_START in config fileSteven Rostedt2011-06-151-0/+11