summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'locks-3.15' of git://git.samba.org/jlayton/linuxLinus Torvalds2014-04-0412-184/+356
|\
| * locks: make locks_mandatory_area check for file-private locksJeff Layton2014-03-311-2/+13
| * locks: fix locks_mandatory_locked to respect file-private locksJeff Layton2014-03-315-17/+18
| * locks: require that flock->l_pid be set to 0 for file-private locksJeff Layton2014-03-311-0/+24
| * locks: add new fcntl cmd values for handling file private locksJeff Layton2014-03-316-20/+126
| * locks: skip deadlock detection on FL_FILE_PVT locksJeff Layton2014-03-311-2/+17
| * locks: pass the cmd value to fcntl_getlk/getlk64Jeff Layton2014-03-313-8/+10
| * locks: report l_pid as -1 for FL_FILE_PVT locksJeff Layton2014-03-311-2/+2
| * locks: make /proc/locks show IS_FILE_PVT locks as type "FLPVT"Jeff Layton2014-03-312-2/+10
| * locks: rename locks_remove_flock to locks_remove_fileJeff Layton2014-03-313-4/+4
| * locks: consolidate checks for compatible filp->f_mode values in setlk handlersJeff Layton2014-03-311-34/+12
| * locks: fix posix lock range overflow handlingJ. Bruce Fields2014-03-312-71/+32
| * locks: eliminate BUG() call when there's an unexpected lock on file closeJeff Layton2014-03-311-6/+18
| * locks: add __acquires and __releases annotations to locks_start and locks_stopJeff Layton2014-03-311-0/+2
| * locks: remove "inline" qualifier from fl_link manipulation functionsJeff Layton2014-03-311-8/+4
| * locks: clean up comment typoJeff Layton2014-03-311-1/+1
| * locks: close potential race between setlease and openJeff Layton2014-03-312-13/+68
| * MAINTAINERS: update entry for fs/locks.cJeff Layton2014-03-311-1/+2
* | Merge branch 'cross-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2014-04-0417-313/+643
|\ \
| * | ext4: add cross rename supportMiklos Szeredi2014-04-011-1/+138
| * | ext4: rename: split out helper functionsMiklos Szeredi2014-04-011-73/+126
| * | ext4: rename: move EMLINK check upMiklos Szeredi2014-04-011-4/+4
| * | ext4: rename: create ext4_renament structure for local varsMiklos Szeredi2014-04-011-97/+114
| * | vfs: add cross-renameMiklos Szeredi2014-04-015-41/+131
| * | vfs: lock_two_nondirectories: allow directory argsJ. Bruce Fields2014-04-011-13/+12
| * | security: add flags to rename hooksMiklos Szeredi2014-04-014-9/+16
| * | vfs: add RENAME_NOREPLACE flagMiklos Szeredi2014-04-013-8/+26
| * | vfs: add renameat2 syscallMiklos Szeredi2014-04-0110-15/+58
| * | vfs: rename: use common code for dir and non-dirMiklos Szeredi2014-04-011-112/+75
| * | vfs: rename: move d_move() upMiklos Szeredi2014-04-011-3/+2
| * | vfs: add d_is_dir()Miklos Szeredi2014-04-012-13/+17
* | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-04-04384-7923/+44014
|\ \ \
| * | | [media] em28xx-dvb: fix PCTV 461e tuner I2C bindingAntti Palosaari2014-03-311-0/+10
| * | | Revert "[media] em28xx-dvb: fix PCTV 461e tuner I2C binding"Mauro Carvalho Chehab2014-03-311-10/+0
| * | | [media] em28xx: fix PCTV 290e LNA oopsAntti Palosaari2014-03-281-1/+2
| * | | [media] em28xx-dvb: fix PCTV 461e tuner I2C bindingAntti Palosaari2014-03-281-0/+10
| * | | [media] m88ds3103: fix bug on .set_tone()Antti Palosaari2014-03-281-1/+1
| * | | [media] saa7134: fix WARN_ON during resumeHans Verkuil2014-03-281-2/+2
| * | | [media] v4l2-dv-timings: add module name, description, licenseHans Verkuil2014-03-281-0/+4
| * | | [media] videodev2.h: add parenthesis around macro argumentsHans Verkuil2014-03-281-5/+5
| * | | [media] saa6752hs: depends on CRC32Hans Verkuil2014-03-281-0/+1
| * | | [media] si4713: fix Kconfig dependenciesHans Verkuil2014-03-281-3/+3
| * | | [media] Sensoray 2255 uses videobuf2Arnd Bergmann2014-03-241-1/+1
| * | | [media] adv7180: free an interrupt on failure paths in init_device()Alexey Khoroshilov2014-03-241-7/+11
| * | | [media] e4000: make VIDEO_V4L2 dependency optionalAntti Palosaari2014-03-242-1/+7
| * | | [media] af9033: Don't export functions for the hardware filterMauro Carvalho Chehab2014-03-144-16/+33
| * | | [media] af9035: use af9033 PID filtersAntti Palosaari2014-03-141-51/+10
| * | | [media] af9033: implement PID filterAntti Palosaari2014-03-142-0/+72
| * | | [media] rtl2832_sdr: do not use dynamic stack allocationAntti Palosaari2014-03-141-1/+6
| * | | [media] e4000: fix 32-bit build errorAntti Palosaari2014-03-141-2/+4
OpenPOWER on IntegriCloud