summaryrefslogtreecommitdiffstats
path: root/drivers/net/pasemi_mac_ethtool.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-22 01:28:28 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-22 01:28:28 +0200
commitd995053d045d777e78ba7eba71a6a0733f3aa726 (patch)
tree35cb9e017f55034534b3fdf944e6f263785c49ac /drivers/net/pasemi_mac_ethtool.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff)
parentdnotify: ignore FS_EVENT_ON_CHILD (diff)
downloadlinux-d995053d045d777e78ba7eba71a6a0733f3aa726.tar.xz
linux-d995053d045d777e78ba7eba71a6a0733f3aa726.zip
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
* 'for-linus' of git://git.infradead.org/users/eparis/notify: dnotify: ignore FS_EVENT_ON_CHILD inotify: fix coalesce duplicate events into a single event in special case inotify: deprecate the inotify kernel interface fsnotify: do not set group for a mark before it is on the i_list
Diffstat (limited to 'drivers/net/pasemi_mac_ethtool.c')
0 files changed, 0 insertions, 0 deletions