Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Assorted tiny fixes queued in trivial tree" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits) DocBook: update EXPORT_SYMBOL entry to point at export.h Documentation: update top level 00-INDEX file with new additions ARM: at91/ide: remove unsused at91-ide Kconfig entry percpu_counter.h: comment code for better readability x86, efi: fix comment typo in head_32.S IB: cxgb3: delay freeing mem untill entirely done with it net: mvneta: remove unneeded version.h include time: x86: report_lost_ticks doesn't exist any more pcmcia: avoid static analysis complaint about use-after-free fs/jfs: Fix typo in comment : 'how may' -> 'how many' of: add missing documentation for of_platform_populate() btrfs: remove unnecessary cur_trans set before goto loop in join_transaction sound: soc: Fix typo in sound/codecs treewide: Fix typo in various drivers btrfs: fix comment typos Update ibmvscsi module name in Kconfig. powerpc: fix typo (utilties -> utilities) of: fix spelling mistake in comment h8300: Fix home page URL in h8300/README xtensa: Fix home page URL in Kconfig ...
This commit is contained in:
@@ -1929,7 +1929,7 @@ int hci_recv_frame(struct sk_buff *skb)
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
/* Incomming skb */
|
||||
/* Incoming skb */
|
||||
bt_cb(skb)->incoming = 1;
|
||||
|
||||
/* Time stamp */
|
||||
|
@@ -402,7 +402,7 @@ cfcnfg_linkup_rsp(struct cflayer *layer, u8 channel_id, enum cfctrl_srv serv,
|
||||
|
||||
phyinfo = cfcnfg_get_phyinfo_rcu(cnfg, phyid);
|
||||
if (phyinfo == NULL) {
|
||||
pr_err("ERROR: Link Layer Device dissapeared"
|
||||
pr_err("ERROR: Link Layer Device disappeared"
|
||||
"while connecting\n");
|
||||
goto unlock;
|
||||
}
|
||||
|
@@ -57,7 +57,7 @@ void irlap_start_query_timer(struct irlap_cb *self, int S, int s)
|
||||
* Basically, we multiply the number of remaining slots by our
|
||||
* slot time, plus add some extra time to properly receive the last
|
||||
* discovery packet (which is longer due to extra discovery info),
|
||||
* to avoid messing with for incomming connections requests and
|
||||
* to avoid messing with for incoming connections requests and
|
||||
* to accommodate devices that perform discovery slower than us.
|
||||
* Jean II */
|
||||
timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s)
|
||||
|
@@ -1201,7 +1201,7 @@ nodata:
|
||||
* specifically, max(asoc->pathmtu, SCTP_DEFAULT_MAXSEGMENT)
|
||||
* This is a helper function to allocate an error chunk for
|
||||
* for those invalid parameter codes in which we may not want
|
||||
* to report all the errors, if the incomming chunk is large
|
||||
* to report all the errors, if the incoming chunk is large
|
||||
*/
|
||||
static inline struct sctp_chunk *sctp_make_op_error_fixed(
|
||||
const struct sctp_association *asoc,
|
||||
|
Referens i nytt ärende
Block a user