diff options
author | 2010-09-17 10:23:08 -0700 | |
---|---|---|
committer | 2010-09-17 10:23:08 -0700 | |
commit | 70057a5a61a9c703aac0cc51811de8d3384d2889 (patch) | |
tree | dbc78019d3dab85d43baa11fe661e4a3eaeb61a6 /fs/jbd2/commit.c | |
parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
parent | firewire: nosy: fix build when CONFIG_FIREWIRE=N (diff) | |
download | wireguard-linux-70057a5a61a9c703aac0cc51811de8d3384d2889.tar.xz wireguard-linux-70057a5a61a9c703aac0cc51811de8d3384d2889.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: nosy: fix build when CONFIG_FIREWIRE=N
firewire: ohci: activate cycle timer register quirk on Ricoh chips
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions