summaryrefslogtreecommitdiff
path: root/changelog
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2009-01-25 16:09:23 +0100
committerTobias Klauser <tklauser@distanz.ch>2009-01-25 16:09:23 +0100
commitae62197f6a0124fd6428d42a501e11cee68e6182 (patch)
treebf8d4749a4335758dbfc3ed93b9eb70f70ae749e /changelog
parent1410a0f20d46a64c1ca7ad23328f637a83c803ac (diff)
Add -q, --quiet and --silent options
inotail should become option compatible to GNU tail.
Diffstat (limited to 'changelog')
0 files changed, 0 insertions, 0 deletions
c3f0f36c13cec746fb9 (diff)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John Linville says: ==================== Here is another batch of updates intended for 3.6. This includes a number of pulls, including ones from the mac80211, iwlwifi, ath6kl, and wl12xx trees. I also pulled from the wireless tree to avoid potential build conflicts. There are a number of other patches applied directly, including a number for the Broadcom drivers and the mwifiex driver. The updates cover the usual variety of new hardware support and feature enhancements. It's all good work, but there aren't any big headliners. This does resolve a net-next/wireless-next merge conflict reported by Stephen. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/connector')